Origin of kittens
Merge branch 'master' of https://github.com/bertm/EA-presentation

Conflicts:
	presentation.tex