Finished merge
Merge branch 'master' of github.com:RickCSong/first_app

* 'master' of github.com:RickCSong/first_app: