new photos
Merge branch 'master' into gh-pages
menu active
Merge branch 'gh-pages'

Conflicts:
	index.html
	js/home.js