commit
Merge branch 'master' of https://github.com/DanielRamsauer/DistrSystems

Conflicts:
	.gitignore