changed sass
Merge branch 'master' of https://github.com/disisid/edx-default-theme

Conflicts:
	static/sass/_default.scss
ch1