Changes to camera and collision manager
Merge branch 'master' of https://github.com/ggamb002/cs134_Current