added test for fhellows displaying and filtering on homepage
merging conflict
Merge branch 'master' of https://github.com/michballard/fhellow