Let it run with PG on heroku
Use DATABASE_URL instead
Merge branch 'master' of github.com:Cisco-Meraki-CFG/LightBikes

Conflicts:
	package.json