Added popups
Merge branch 'master' of https://github.com/aslushnikov/picsha

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/aslushnikov/picsha