Added fontawesome/updates
Merge branch 'master' of https://github.com/ronoc5518/moderntemplate

Conflicts:
	stylesheets/styles.css
Updates
Merge branch 'master' of https://github.com/ronoc5518/moderntemplate