merge conflict fixed for the stylesheet
Merge branch 'master' of github.com:jassicacanidy/CallistoReinvented