Merge
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Simulator/src/simulator/Main.java