updates
Merge branch 'master' of https://github.com/sirajrkhan/angular_poc