fixed

everything?
Merge branch 'master' of https://github.com/ericcheng95/LA-Hacks

Conflicts:
	Photo.html