Initial commit
Merge branch 'master' of github.com:siye1982/sample_app