Misc
clean up
Merge branch 'master' into gh-pages
bootstrap.css to flatly.css
Merge branch 'gh-pages'