intial commit
Merge branch 'master' of https://github.com/jamesmgg/Trippy-Android-App