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

updated to master again
Merge pull request #6 from 12-01Game/master

Adding a ton of jank
Merge branch 'Light-Switches' of https://github.com/12-01Game/12-01 into Camera