Angular
Merge branch 'Angular' of http://github.com/LuisEnVilla/CheckTrips into Angular