able to collect location from user
lat and long now stored in a session cookie :lat_long
cleaned up view
added ar-postgis and dependencies
spatial table migrated successfully
fixed naming conventions on the locations table
removed bad migration for locations
replaced the migration... AGAIN
able to collect records from users
merged geo locate setup
Conflicts:
	app/assets/javascripts/journal.js
	app/controllers/journal_entries_controller.rb
	db/schema.rb
Merge branch 'collect-geo'
Merge branch 'master' of https://github.com/christophwong/pony-with-ponytails

Conflicts:
	app/assets/javascripts/journal.js