Added a sidebar nav
Vince and I added the add another place to the map page included show hid jQuery
Trying to merge and get latest journaly
Merge pull request #4 from triathlonboy/master

Friday Pull Request to allow others to fetch over the weekend if needed
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
Latest version still issues with marker links
cleaning up tmp files