some change
first work on slides
merged
Merge branch 'master' of https://github.com/locolupo/DODBerlin

Conflicts:
	index.html