final versions
erge branch 'master' of https://github.com/danieleliassen/trafiksimulering

Conflicts:
	Lane.class
	Light.class
	Simulation.class
	TrafficSystem.class