Added Photoshop folder to gitignore
Merge branch 'Nick' into Deeban
Merge branch 'Deeban' of https://github.com/rdeeban/Game into Deeban