modified:   SPinuit/css/custom/sp/form.scss
	modified:   SPinuit/css/style.css
Merge branch 'master' of https://github.com/nicvangu/SPInuitSass

Conflicts:
	SPinuit/css/style.css

	modified:   SPinuit/css/custom/sp/form.scss
	modified:   SPinuit/css/style.css