Wat?
Merge branch 'how-to-gh-pages' of github.com:theodi/presentations into how-to-gh-pages

Conflicts:
	2014-04-how-to-gds.html