readme edit - missing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #1 from KyleChamberlin/master

merge with upstream update