model user
Merge branch 'master' of https://github.com/mwmarzin/DrinkChewGuru

Conflicts:
	db/development.sqlite3
	db/schema.rb