Add funny stuff to our documentation
Merge branch 'master' into 55-funny-stuff

Conflicts:
	README.md
Merge pull request #1 from johannesboyne/55-funny-stuff

Add funny stuff to our documentation