Merge pull request #3 from serialworm/master

Update README.md
adding bug fix if branch not made yet
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tasks/build_gh_pages.js