Commented
Merge branch 'master' of
ssh://git@github.com/GabTheWeasel/Prog1Trafik.git

Conflicts:
	Trafik/src/TrafficSystem.java