committing before merge
Merge branch 'gh-pages' of https://github.com/lewis500/talk into gh-pages

Conflicts:
	index.html
	talk.sublime-workspace