update gemfile
capybara factory girl setup
Merge pull request #1 from shawnbro/master

capybara factory girl setup
remove database yml
Merge branch 'master' of https://github.com/peterylai/yearbook.er
db
config update
Merge fix