added to user model
Fixed merge conflicts in schema
added password method from bcrypt
fixed merge conflicts
added to_s to pasword setter