Switched to postgres on heroku
remove sqlite3
heroku edit
changed gemfile
Database.yml and gemfile merge conflict fixes
change gemfile
fixed gemfile.lock
new gemfile.lock
Merge branch 'master' of github.com:rboling/RevoltDC
edit whitespace
Fix staging merge conflicts
Adding Gemfile.lock for heroku staging
Edited gemfile to remove heroku gem, added ruby version