chance_conflict
Merge branch 'master' of https://github.com/Catpaw42/Matador.git

Conflicts:
	Matador_2/src/game/fields/Chance.java