committing changes to sass file
fixing errors from the pull and committing changes