Edit 4
more changes
Merge pull request #20 from oxtopus/edit-4

Edit 4
Merge remote-tracking branch 'upstream/master' into my-feature

Conflicts:
	README.md
Merge pull request #21 from rhyolight/my-feature

My feature
Merge remote-tracking branch 'upstream/master'