Segunda version
Merge branch 'master' of github.com:oscarcn1/TransportesTuxpan

Conflicts:
	LICENSE
	README.md