Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/shared/application/_header.html.erb
	config/initializers/devise.rb
	config/initializers/repositories.rb
	config/orient_db.yml