rearrange photos in gallery
Merge branch 'master' of https://github.com/brianjscoles/flyingcarpet

Conflicts:
	photos.html