2eme Conflit
Merge origin/master

Conflicts:
	src/goldencage/GoldenCage.java