SASS diff from stanford themed branch for master