Git Presentation
Merge branch 'master' of github.com:qpalmeraereo/reveal.js

Conflicts:
	index.html