readme update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
fixed section divider conflicts
Merge pull request #26 from bglassy/master

fixed section divider conflicts