commiting before merging with vince
Merge remote-tracking branch 'vince/mynewbranch'

Conflicts:
	log/test.log
commiting before merging with vince
merging with vince's new code
Merge remote-tracking branch 'vince/fixing_css'
commiting tidy javascript
commiting tidy javascript
commit before merge from ecomba
commit before pushing to remote
Trying to merge and get latest journaly
Some Sunday updates
Put in temp body background for offline dev
commit before merging with frontend additions
commiting before merge
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