removed some deleted files from git
deleted files
removed jeff's password from database.yml
sorted out merge conflict on database.yml