icon fonts
Merge branch 'master' of https://github.com/robr24/mash

Conflicts:
	css/style.css