Merge branch 'gh-pages'
Fixed width issue on phones
Merge branch 'master' into gh-pages