add public/uploads to gitignore
add stuff to gitignore
add postgres for heroku
fix merge conflict