Initial import.
Merge branch 'master' of https://github.com/simonbrowndotje/presentations

Conflicts:
	.gitignore