Merge pull request #10 from WhaleMonster/kevin

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

css
Done for the night