Ruta completa
Merge branch 'master' of https://github.com/ibaiosa5/Trucker

Conflicts:
	index.html
	js/Tilotiti/jquery.googlemap.js
	js/app/main.js
	js/app/ui.js
	js/jquery.googlemap.js
	trucker.sublime-workspace