Fields update
Merge branch 'master' of https://github.com/Blackflunk/CDIO3.git

Conflicts:
	CDIO3/src/FieldGame/Player.java