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

Conflicts:
	js/fonts.min.js
	js/script-touch.min.js