made scss 2 indents and no tabs
merge