fonts addition2
ignoring text file
fixing gitignore
Merge branch 'master' into Diego2

Conflicts:
	.gitignore