Integration patches from the Assignment 6 demo. #17

Closed koninckx closed 9 years ago