css
fixed merge conflict
Merge pull request #11 from WhaleMonster/michelle

css