HRIS

hRIS
Merge branch 'login&logout' into Login-&-Logout

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/database.yml
	config/routes.rb
	db/schema.rb
	log/development.log
Merge pull request #1 from Ariasm55/Login-&-Logout

Login & logout