Add to CSS.
Fix merge conflict.
Merge pull request #33 from cassiemoy/master

new css :) can merge now thank god