init]
Merge branch 'master' of github.com:silenceper/angularjs-demo