more updates
Merge branch 'master' of https://github.com/xiecheng59/cs123_final

Conflicts:
	src/scene.cpp

fixed merge conflict