Make basic User model (with secure passwords)
Update Users with passwords
Update users
Finish basic User model (with passwords)
Merge branch 'usersChanges'

Conflicts:
	Gemfile.lock
	app/views/users/new.html.erb