third commit
fourth commit
added pg and rails_12 factor for heroku