Adding a spring motion, time based camera.
Merge branch 'master' of https://github.com/ethanmn/CPE476Final

Conflicts:
	src/game.cpp