Updated photos and text
Merge branch 'master' of https://github.com/offsky/foldnfly

Conflicts:
	app/data/4/json.txt
	app/data/5/json.txt
Text change