Container hotfix conflict test.
Merge branch 'master' of https://github.com/JollyJavelin/MonsterGames

# By janvandijke
# Via janvandijke
* 'master' of https://github.com/JollyJavelin/MonsterGames:
  Hotfix na laatste commit

Conflicts:
	Container.java