Heroku pg url is not DATABASE_URL
Added additional data for mocked data
Merge branch 'master' of https://github.com/slowteetoe/burning-questions-backend

Conflicts:
	spec/spec_helper.rb
tweaked tests to pass
Tweaked some fake data