Fix presentation.json
Merge branch 'gh-pages' of https://github.com/fh-koeln/wba1-2013 into gh-pages

Conflicts:
	presentations.json