fixed stuff
Merge branch 'master' of https://github.com/pranavbhalla89/Tripsters

Fixed stuff
headache