Merges (squashed) master.

Conflicts:
	index.html
Adds missing photo