Grammar Nazi input
Merge pull request #7 from w0lya/master

Grammar Nazi input
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md