stash
merging
draft
commiting some CSS tweaks
changing to postgresql for deployment
commitz
commitz
changed migrations
changed the places migration
commented out that sinatra code that slipped into the app
more db plumbing
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	db/schema.rb
merging dev functionality into master after puling down
Merge branch 'dev2'
some style
merging changes
Merge pull request #17 from KeirOsborn/master

before pushing to heroku
draft
merge
Merge remote-tracking branch 'nicky/dev' into dev
added polylines for multiple journeys