my first app, learn activity
Merge branch 'master' of https://github.com/wang-jingyi/android-apps

in order to push changes, have to pull first and merge