add Colore
Merge branch 'master' of
https://github.com/aTurrini/it.turrini.git.test.github.git into
developer2

Conflicts:
	testProject/src/model/Car.java