Fixed.. thank god
Merge commit 'd7a6f37'

Fixed serious issues with website not running
on localhost, still no luck with heroku
database.yml
application.rb
application.rb
comment... application.rb
uncomment
moved line
lines
moved
come
come
come
come
manifest.yml