Added setLookAt and timeDifs to Camera
Added dance_cyl.dae
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
better jump
Merge branch 'deer_movement'

Conflicts:
	src/Camera.cpp
Merge with master...
sanitized