Añadido int
Commit random
fadfadfaf
Merge branch 'master' of https://github.com/Ivanmartinezperez/CARS.git

Conflicts:
	Cars-desktop/src/com/me/Cars/Main.java
Merge branch 'master' of https://github.com/Ivanmartinezperez/CARS.git

Conflicts:
	Cars-desktop/src/com/me/Cars/Main.java