Styled home page
merged conficts
Merge branch 'master' of https://github.com/Iancam/pantry