Added files
resolved conflict
Modified gitignore
Merge branch 'master' of https://github.com/chrisgp/Photon