fixed the deer's aim
added a game state where the camera circles the deer
only draw trees/ground/deer in START mode
Merge branch 'master' into deer-games

Conflicts:
	src/Camera.cpp
	src/game.cpp
	src/globals.cpp
moved spring_motion into its own class
put the far plane on a spring
tweaked values
Merge branch 'master' into deer-games

Conflicts:
	src/game.cpp
Merge branch 'master' into deer-games
slower camera spin
Merge branch 'master' into deer-games
Merge branch 'master' into deer-games

Conflicts:
	src/game.cpp
deer chases pinecone
Merge remote-tracking branch 'origin/master' into deer-games

Conflicts:
	src/game.cpp
	src/globals.cpp
cool camera angle while pouncing
kick the pinecone in the cutscene
better friction
Merge branch 'master' into deer-games

Conflicts:
	src/game.cpp
Merge branch 'master' of github.com:Ethanmn/CPE476Final
Moved small bushes and time stones down.