Line edits to section 1
Merge branch 'master' of https://github.com/WordPress/book

Conflicts:
	Content/Part 1/3-the-blogging-software-dilemma.md