rebase commit.
Merge branch 'master' of https://github.com/sireline/TechBlog

Conflicts:
	node.js/node.js.md