Push voor Hidde
Updated Simulation.java
mergefix jacco/head : document 'boat.java' was duplicated, could cause error