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

Conflicts:
	homepage.html