added styling to homepage
fixed merge conflicts
fixed merge conflicts
Merge pull request #3 from laurenbenichou/master

added styling to homepage