Added font-awesome
Mergin changes to gh-pages
Merging changes