Merge branch 'gh-pages'
A bunch of responsive work
Merge branch 'master' into gh-pages