Trying to merge and get latest journaly
Some Sunday updates
Put in temp body background for offline dev
Updating Maps Show page
Updating Maps Show Page
Some more updates
Got it sorted
Trying to tidy up the JavaScript
Routed to maps page on local3000 load
merge branch 'master' of github.com:ecomba/journaly

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/CE5/650/sprockets%2F8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/D9F/300/sprockets%2Fc13fc73ceafa45876a901b3e775b83ae
Click on Marker work
updating the CSS for the homepage
Latest version still issues with marker links
first commit
updated places CSS
cleaning up tmp files
Merge pull request #5 from KeirOsborn/master

pull request for latest code, half way through journal entry stuff
draft
merging
updated the trips CSS