fixed user signup and signin functionality
Merge branch 'master' of github.com:drewlsvern/computer_geeks

Conflicts:
	app/models/user.rb
	app/views/devise/registrations/new.html.erb