Merge branch 'master' into gh-pages
basic and empty
Merge branch 'gh-pages' of https://github.com/Pingendo/bootstrap-templates into gh-pages