Merge pull request #1 from JaimeLynSchatz/master

intial commit of main files
generating rails app
setting up heroku
getting pg set up properly
more work getting heroku working
trying to make heroku work