Added user migration, model, and barebones controller
Fixed bcrypt version error
Added annotate and rspec
merged users
Added annotation for users