Merge pull request #12 from WhaleMonster/kevin

Late night
added css
merge conflict
Merge conflict