Added project.properties file
Merge branch 'master' of https://github.com/changj23/CabPool
Fixed merge errors