Adding the new version of the project
Merge branch 'master' of https://github.com/davidmarcano/E-trip