short story
Merge branch 'master' of https://github.com/flwyd/quotes

Conflicts:
	oneliners.txt