pulled from origin/master
added changes to match master branch
commit test 1
commit test 2
commit test 3
Merge branch 'gh-pages' of github.com:ereboz/manabu into gh-pages
Update index.html

Added class "flexgrid" to wrapper div
<div class="wrapper flexgrid">
Merge branch 'gh-pages' of github.com:ereboz/manabu into gh-pages
adding styles
Merge branch 'master' of github.com:ereboz/manabu