Merge
Merge branch 'master' of https://github.com/changj23/CabPool
Merge pull request #21 from chin-andrew/master

Fixed errors in ListOffersGUI; small GUI changes
Fixed options menu
Merge branch 'EditProfileGUI'
Fixed activity
Merge
Added project.properties file
Merge branch 'master' of https://github.com/changj23/CabPool
Fixed merge errors
Added button
Added changes so you can rate and pay
Merge pull request #23 from irislyng/master

Made changes & stuff
For andrew