continue the knock-knock joke
finish the joke
finish the joke even better
Merge branch 'master' into knock-knock

Conflicts:
	README.txt