-First commmit
Merge branch 'master' of https://github.com/yinshen/angularjs_vagrant_test