keynote changing
Merge branch 'master' of https://github.com/derousseur/derousseur.github.io

Conflicts:
	css/style.css