prevent accidentally committing new fonts
Merge branch 'master' into char-spec

Conflicts:
	.gitignore