index.html
test image
Merge branch 'master' of github.com:aslushnikov/picsha

Conflicts:
	public/index.html