im lost
Merge branch 'dev' of github.com:wmantegna/spork into dev

Conflicts:
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/userRestrics.html.erb
	app/views/visitors/index.html.erb
	config/routes.rb