Merge pull request #4 from 12-01Game/master

updating camera to master
Merge branch 'master' into Camera
Merge branch 'Light-Switches' of https://github.com/12-01Game/12-01 into Camera