Merge branch 'master' of https://github.com/Wheez/Containing

# By Jos
# Via Jos
* 'master' of https://github.com/Wheez/Containing:
  no message
  no message

Conflicts:
	Containing old/src/containing/Main.java
	Containing/src/containing/Main.java
	Containing/src/mygame/Main.java
	Simulatie/build/classes/mygame/Main.class
	Simulatie/build/classes/mygame/TruckCrane.class
back to backup
no message
Merged them files. Placed the truckcranes.
Latest version. Has random error of rendering when water effect is on!
Ran simulation, need new commit.
no message
Merge branch 'Jos'

Conflicts:
	Simulatie/build/classes/mygame/Main.class
	Simulatie/build/classes/mygame/TruckCrane.class
no message
Latest version, usecommands works!
Merge branch 'master' of https://github.com/Draaky/Containing

Conflicts:
	Programmas/Simulatie/build/classes/mygame/Main$1.class
	Programmas/Simulatie/build/classes/mygame/Main.class
	Programmas/Simulatie/build/classes/mygame/TruckCrane.class