Some stuff added
Merge branch 'master' of https://github.com/BohnanzaTeam/Bohnanza.git

Conflicts:
	src/main/Field.java
	src/main/Game.java