Ultimos cambios

asd
Merge remote-tracking branch 'origin/JoseLuis'

Conflicts:
	CocheAmigos/Controllers/MainController.cs
	Repository/CocheAmigos.edmx