commit
Merge branch 'master' of https://github.com/markho/andpad1.git