css changes: first icon font test, minor layout changes
Merge branch 'master' of https://github.com/schuel/hmmm

Conflicts:
	client/views/main.html