Fixes issues #6 -- adds Merriweather has top font choice
Fixes issue #8 -- cog substituted for wrench as settings icon
Add hammer.js to repo for testing
Makes changes to style.css
Downloads hammer.js
Merge fix for pull request
Merge conflicts with remote
Adds footer and article ad