Diagrams folder
!
Merge branch 'master' of https://github.com/jbeckers/POWS.git

Conflicts:
	src/ArneTestClass.java