update
Merge branch 'develop' of https://github.com/tckeelin/RideShare into develop
fixing develop from bad merge