all da shit
Merge branch 'master' of github.com:flyingkrai/angular-study