fixed user table
Merge branch 'master' of https://github.com/sierraflynn/A_Bakers_Dozen

Conflicts:
	db/schema.rb
fixed schema