FE
Merge branch 'master' of git://github.com/hints/howtobe

Conflicts:
	frontend/index.html