removed some deleted files from git
deleted files
removed jeff's password from database.yml
sorted out merge conflict on database.yml
removed database.yml from index
Merge branch 'master' of github.com:rjshade/eighty-thousand-hours
sorted merge issues