dunno
Merge branch 'homeScreen' into development
spacing fix
Merge branch 'development' of https://github.com/andrliu/GoTrip into development
fix merge