step 0
Merge branch 'master' of https://github.com/majun8cn/AngularJSDemo