Change class name btn-rounded
Change class name btn-rounded
Chage class name
Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/css/shopstyle.css
	dist/css/shopstyle.css.map
	dist/css/shopstyle.min.css
	src/scss/shopstyle.scss