change pg for heroku. add heroku_secrets to use secrets.yml
comment out settings_logic stuff
try to fix this lol
add rails_12factor gem for heroku assets
use default webserver, i think is webrick
change domain to heroku
re set domain
Merge branch 'master' of https://github.com/vic/devf
add gemfile lock
merge
gemlock issue