Merge branch 'master' of https://github.com/infJAVAdame/JavaProjekt.git

Conflicts:
	src/ro/inf/p2/project/DameTest.java
	src/ro/inf/p2/project/SpielStein.java