Made basic user model (including secure passwords)
Made basic user model (including secure passwords)
Merge branch 'modeling-users'

Conflicts:
	Gemfile.lock
	db/schema.rb