added a content_for :homepage
merge
Ehh
Ehh2