Merge branch 'master' of https://github.com/espemi01/espemi01.github.io

Conflicts:
	photo.html
	summerfest.html
Merge branch 'master' of https://github.com/espemi01/espemi01.github.io

Conflicts:
	about.html