RyanCommit. Do it!!!
Merge branch 'master' of https://github.com/ywangbc/COMP4411

Conflicts:
	impressionist.sdf
	ipch/impressionist-6909d040/impressionist-fa0882cd.ipch