deleted photon folder in my project
Merge branch 'master' of http://github.com/davidschaller/alma1
Merge branch 'master' of http://github.com/davidschaller/alma1