continued work, committing so I can pull
Merge branch 'master' of github.com:stephjsu/get-your-ride