Rebuilt site with a simpler architecture
Merge branch 'master' of https://github.com/andreasmb/srhnhm

Conflicts:
	public/js/index.js
Merge branch 'master' into gh-pages