Generated a users controller
Implemented index, show, new, create, and destroy
Implemented not admin function
Added users tab to header
Renders all users
Added users resource to routes, added 'new user' page
Deleted user controller, modified devise sign up for Admins to be able to create users
Added display all users for admin
renamed oprsystem controller to pages controller, padmin can see a list of all users
Generated admins controller
Added admins the ability to add users
Fixing bugs in admins adding new users
Allows admins to create new users and give them role
Merge branch 'login'

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/new.html.erb
	app/views/devise/shared/_links.html.erb
	app/views/layouts/_header.html.erb
	config/routes.rb
Merge login branch