Buttons
Merge branch 'master' of github.com:pocha/codelearn-new-design-sass

Conflicts:
	app/assets/stylesheets/application.css.scss