bootstrapped
Merge branch 'master' into gh-pages
added row class
Merge branch 'master' into gh-pages