Initial commit
Working on my presentation
Updating presentation
Finishing up the presentation
Last-minute changes
Merge branch 'master' into origin-gh-pages

Conflicts:
	index.html
Removing gh-pages generated stuff