commit
Merge branch 'master' of https://github.com/merceamoroscon/TESTPROYECTO

Conflicts:
	CocheAmigos/Models/JourneyModel.cs
conflict solve