changed h1
Merge branch 'master' of https://github.com/geibi/pictureserve

Conflicts:
	index.html

subject: <h1> title