Sistemato frenaaaaa !!
Merge branch 'master' of https://github.com/EnricoGiordano1992/IngProj2.git

Conflicts:
	src/car/Car.java
	src/start/Simulator.java