Add the conversion to using postgres db
This stuff all got created at run-time, I think
changes needed to enable pg database
Merge branch 'heroku' of https://github.com/pfcass/grapewitz into heroku

Conflicts:
	config/database.yml
.iml
add seed data
db name changes
Merge branch 'master' into heroku
Imporve seesds.  Add icons
Conflicts:
	db/schema.rb
	db/seeds.rb
Merge branch 'master' into heroku
- Change name of default user to grapewitz@gmail.com
Color changes.
messin' w/ the color
fix sql bug
layout changes
some routing changes in new wine creation
Merge heroku branch.

-- now using postgres
Merge branch 'heroku'