adds css styling
resolving merge conflicts
merge conflicts RESOLVED unlike the middle east