database update
remove database yml
database setup
updating gemfile and rspec
spec user and story model
update merging