some stylesheets added
merge conflicts fixed