css and collection star
Merge branch 'master' of https://github.com/walkerart/mnartists

Conflicts:
	sites/default/modules/mnartist_collections/mnartist_collections.module

i hate it when this happens