Initial commit
Improve the README
Merge branch 'master' of https://github.com/zhangying25/sample_app

Conflicts:
	README.md