col-xs-pull-12
Merge branch 'master' into gh-pages