Some changes, header and footer integrated
Cleaned up a little.
Still needs Os specify integration
Merge branch 'master' of github.com:mbrodo/fontawesomeparser

Conflicts:
	fontawesome.sty