Add changes from merge.
Merge branch 'master' of https://github.com/erlaroche/Home_Sit
Correct font-awesome removal, ran bundle exec rake db:drop db:create db:migrate
Add google font
Add merged branch
Working google font