draft
commiting some CSS tweaks
changing to postgresql for deployment
commitz
Merge pull request #16 from raven-valentine/master

added previous place
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'
Adding polylines to the map
some style
merge
merging changes
Merge pull request #17 from KeirOsborn/master

before pushing to heroku
fixed a bug in the google map api library code
merge