Controller updated
Merge branch 'master' of https://github.com/hen31/Containing

Conflicts:
	ContainingSimulator/src/mygame/Main.java