add show view for artists and styles!
Merge branch 'master' of github.com:brimatteng/ArtistCharityApp into theViewFromUpHere

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