Changed seeds to adjust for today's date; changed link to orders/new
Merge pull request #59 from deedeelavinder/master

postgres, again
Updated view for orders#new and orders#show; added related methods to models
Merge pull request #61 from deedeelavinder/master

travis, again
Merge pull request #62 from deedeelavinder/master

travis fix
Merge pull request #63 from deedeelavinder/master

travis attempt
Merge pull request #64 from deedeelavinder/master

name change conflict in .travis.yml
Merge pull request #65 from deedeelavinder/master

ridiculsoity
Merge pull request #66 from deedeelavinder/master

bi
Merge pull request #67 from deedeelavinder/master

yup
Merge pull request #68 from deedeelavinder/master

f
Merge pull request #69 from deedeelavinder/master

working on test db
Merge pull request #70 from deedeelavinder/master

created another db yml travis file
Merge pull request #71 from deedeelavinder/master

heroku config update
Merge pull request #72 from deedeelavinder/master

travis encryption
Merge pull request #73 from deedeelavinder/master

test for heroku
Added neat; updated view for orders#new and orders#show
Merge branch 'upstream_merge'
Added back yml file for travis
Changed test db to travis_ci_test