Updating learning repo's
Merge branch 'master' of github.com:nikeshashar/Nodeschool
merge conflicts