fixed button IDs in java files
Merge pull request #20 from BenM64/master

fixed button IDs in java files
Merge branch 'irisly'
Merge branch 'master' of https://github.com/changj23/CabPool

Conflicts:
	project.properties
Merge
Merge branch 'master' of https://github.com/changj23/CabPool