Added slidify slides
Modified index.html
Changes to gh-pages, pre-merge master
Fix conflicts from gh-pages branch merge master
Moving files around on gh-pages