Add completed tasks and assignments (olemstrom)
fix formatting errors
resolve conflicts
remove conflict markerks
Merge branch 'master' of github.com:paazmaya/modern-web-tools-with-node-js-book

Update repo from upstream
fix formatting
Merge pull request #88 from olemstrom/master

Add completed task and assignments