touched the gitignore
Merge branch 'master' of github.com:iwoodruff/nyc_rat
merge conflict
db.yml
seeds in
Merge branch 'master' of github.com:iwoodruff/nyc_rat