temp
Merge branch 'master' of github.com:brechang/tripster
friends working kinda
merged