All the files
All the files
Merging with git: next try
Git mergeing: 3rd try is the charm

Merge branch 'master' of https://github.com/elte-szoftproj/komponens

Conflicts:
	kompgame-ear/pom.xml
	kompgame-ejb/src/main/java/hu/elte/komp/game/Piece.java
	pom.xml