well some css
some more changes
resolved merge conflicts
Merge pull request #18 from kiopelani/ariana

css before friday