Add pg database stuff for heroku intergration
Update gemfile.lock
Merge branch 'master' of https://github.com/brentwalther/SwagBag

Conflicts:
	Gemfile
	Gemfile.lock