Artist model
artist
Update application.html.erb
last commit
Merge remote-tracking branch 'origin/artist' into develop

Conflicts:
	baobab/app/views/layouts/application.html.erb