user feed css
Merge branch 'master' of https://github.com/walkerart/mnartists

Conflicts:
	sites/default/themes/mnartists/css/fixed_width.css
	sites/default/themes/mnartists/css/style.css
	sites/default/themes/mnartists/css/variable_width.css
	sites/default/themes/mnartists/sass/style.scss