merge test
Merge branch 'master' of https://github.com/Mduchamp/CS-184

Conflicts:
	Scene.cpp