extras
Merge branch 'master' of https://github.com/eakellogg/HashFortune

Conflicts:
	userLogs/monkey.txt