played with fonts
Not sure this is correct.
Merge branch 'master' of https://github.com/talkingstick/repo

Conflicts:
	css/main.css