Continue the knock-knock joke
Finish the joke
Finish the joke even better
Merge branch 'knock_knock'

Conflicts:
	README.txt