init commit
Merge branch 'master' of https://github.com/roycp/android-cw2-activitylab