Updating user model and database. check database.yml
Merge branch 'sterling_work' of github.com:AlexZerr/bonediva into sterling_work

Conflicts:
	config/database.yml
	db/schema.rb