Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/byuweb/byu-responsive-dev into gh-pages