wieder scheiss xml
Merge branch 'master' of https://github.com/raphibolliger/algd1

Conflicts:
	.idea/workspace.xml