Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/door_logs_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/door_logs/download.html.erb
	app/views/door_logs/show.html.erb
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
	app/views/users/upload.html.erb
	app/views/users/upload_all.html.erb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb
	db/schema.rb

Gemfile

@@ -23,6 +23,13 @@ end
 
 gem 'jquery-rails'
 
+<<<<<<< HEAD
+=======
+gem 'devise'
+
+gem "cancan"
+
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'