LimitAccess-Alan
Merge branch 'master' of https://github.com/gnahidi/gmu_library_project

Conflicts:
	library/app/controllers/admin_controller.rb
	library/app/controllers/sessions_controller.rb
	library/app/controllers/users_controller.rb
	library/app/models/user.rb
	library/app/views/sessions/new.html.erb
	library/app/views/users/_form.html.erb
	library/config/routes.rb