stash
merging
Merge pull request #14 from hoongman/current_master

fixing date entry
draft
started on development for adding routes to a map
Merge pull request #15 from hoongman/current_master

fixing dates
rake db
commiting some CSS tweaks
changing to postgresql for deployment
added last place
merge
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'