Added font-awesome to make stuff a little awesome
Merge remote-tracking branch 'origin/master'