diseño merce
commit
Merge remote-tracking branch 'origin/master' into MERCE
diseño
commit
Merge remote-tracking branch 'origin/JoseLuis'

Conflicts:
	CocheAmigos/Controllers/MainController.cs
	Repository/CocheAmigos.edmx
Merge remote-tracking branch 'origin/JoseLuis'
commit
commit register user
commit
Merge remote-tracking branch 'origin/master' into JoseLuis