Made changes to fix postgresql compatability.
Styling
Fixed merge conflicts
Heroku debugging
Added a parenthesis
Styling and making heroku work