Haciendo pull
Merge branch 'master' of https://github.com/PolimueveT/WebApp
Merge branch 'master' of https://github.com/PolimueveT/WebApp
Merge branch 'master' of https://github.com/PolimueveT/WebApp

Conflicts:
	api/data/TripData.js