Add CM fonts and update design
Merge branch 'I-done_fucked'

Conflicts:
	index.html