making basic user model
Merge branch 'modeling-users'

Conflicts:
	Gemfile