continued edits
Merge branch 'master' of github.com:chukong/programmers-guide

Conflicts:
	2.md
Merge branch 'master' of github.com:chukong/programmers-guide