Updated rotational physics, etc etc etc
Merge branch 'master' of https://github.com/xiecheng59/cs123_final

Conflicts:
	src/final.pro
	src/scene.cpp