Merge pull request #11 from kiopelani/ariana

last changes on css before lunch
Merge branch 'master' into ariana