minof
Merge branch 'master' of https://github.com/peersa/SimPerprojekt

Conflicts:
	.idea/workspace.xml