home css
conflicts solved
Merge pull request #18 from MaxMck/home-css

home css