sirsgriffin merged 14 commits into gh-pages from gh-pages-fast-forward Oct 5, 2015