test
first commit
artist
last commit
Merge remote-tracking branch 'origin/artist' into develop

Conflicts:
	baobab/app/views/layouts/application.html.erb
bon layout
Artwork model ok
Add User roles with AR Enum assoc. with Pundit gem
rails 4.1.0
Merge branch 'sti_on_users' of https://github.com/CelineMartinetSanchez/baobab into artwork

Conflicts:
	baobab/Gemfile.lock
	baobab/app/controllers/application_controller.rb
	baobab/app/views/layouts/application.html.erb
	baobab/db/schema.rb
Merge pull request #5 from CelineMartinetSanchez/artwork

Artwork