All working now!

Hurray!!!
Merge branch 'PhotonBranch' of https://github.com/kissofdeath/ggj14_guidance into PhotonBranch