Astah class diagram export.
Files
Removed Models
Merge branch 'ArjenBr'

Conflicts:
	Doc/Arjen Miedema.txt
	Doc/Jancodevries.txt
XML_Parser, Container list (with filled containers), sockets
Merge branch 'Hugo'
Merge branch 'Hugo's'
Removed unused files.
added models.
added ShipCrane classes.
Moved asta file into asta folder.
removed useless files.
Added latest simulation version in sourcetree
no message
Merge branch 'master' of https://github.com/Draaky/Containing
Removed test terain and updated simulation.
- 4 lijsten voor aankomst en gesorteerd op aankomst
- Sockets gefixed
Merge branch 'Hugo's'
Moved programs to correct folder.
Added Hugo's socket files.
Simulation updated to latest version.
Updated containing.
Fixed sockets.
no message
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