first commit
Merge branch 'master' of https://github.com/kelewele-pimp/AndroidProgramming

new merge created