Make a basic User model including secure password
Added user model, controller and views
fixed merge issues in db/schema.rb