frontend changes
Merge branch 'master' of https://github.com/jordn/photosharer

Conflicts:
	photosharer.html