Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
meaningless change
Revert "meaningless change"

This reverts commit aec54efc8343ab05c4d6dad79685e6430adfe3c2.
Merge branch 'master' of github.com:sleepyfox/Code-Dojo-18
added node/browser switch