# Conflicts:
#	app/assets/javascripts/shop-14.js.erb
#	app/controllers/application_controller.rb
#	app/controllers/carts_controller.rb
#	app/helpers/carts_helper.rb
#	app/views/carts/_cart_table.html.erb
#	config/database.yml

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	db/schema.rb

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	db/schema.rb

[REVIEW] User management

See merge request !2

[REVIEW] Apply bootstrap

See merge request !1