:necktie:
Merge branch 'master' of git://github.com/wesbos/dad-jokes

Conflicts:
	readme.md