Ultimos cambios

asd
Merge remote-tracking branch 'origin/JoseLuis'

Conflicts:
	CocheAmigos/Controllers/MainController.cs
	Repository/CocheAmigos.edmx
coomit
Merge remote-tracking branch 'origin/JoseLuis'
commit
commit register user
commit
commit
Merge remote-tracking branch 'origin/master' into JoseLuis
commit
Updated business object recent Journey and logic class
commit
Merge branch 'master' of https://github.com/merceamoroscon/TESTPROYECTO

Conflicts:
	CocheAmigos/Models/JourneyModel.cs
conflict solve
add files
commit
opinions
languages