Photo's JSON updated, gitignore for actual photo's
Merge branch 'master' of https://github.com/AdamBuczynski/Photography

Conflicts:
	frontend/assets/photos/photos.json