Fixed merge conflicts. Light shaft animates. 4:3 correct.
Merge branch 'master' of https://github.com/awardell/SuperAwesomeGhostGame