Trying to merge and get latest journaly
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
The places markers now redirect to places media page
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	app/views/.DS_Store
	app/views/map/show.html.erb
	db/development.sqlite3
	log/development.log
	log/test.log
	tmp/cache/assets/CE5/650/sprockets%2F8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/D11/470/sprockets%2F874f196ab602286a51c416e3fe76ac5c
	tmp/cache/assets/D23/770/sprockets%2F47d445cee6f9c63a50b6fc91e6829464
	tmp/cache/assets/D27/9D0/sprockets%2Fae94f56d8841643c6b92d17e4f572ef7
	tmp/cache/assets/D78/9A0/sprockets%2Fea6ab7f5af91372551af680f6097f6ea
	tmp/cache/assets/D83/210/sprockets%2Fe2b35ee57f41e86dbde13627597fd8e4
	tmp/cache/assets/D91/080/sprockets%2Fbcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/D9F/300/sprockets%2Fc13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/E45/F80/sprockets%2Fbf7bad4b5dcaf07c868c01fbcb32aa11
	tmp/cache/sass/af18ac4df3c12199e0409e0cc1f3bfa08524eab6/bootstrap_and_overrides.css.scssc
	tmp/cache/sass/af18ac4df3c12199e0409e0cc1f3bfa08524eab6/trips.css.scssc
Merge pull request #7 from hoongman/dev

added date picker to add trip and add places
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	db/development.sqlite3
	log/development.log
Merge pull request #8 from fourmackems/master

Markers Link to places page (to show media related)
switching branches
Solved errors now adding in Charlies updates
Updated code for places marker relationship also fixed JS console problems
commiting add journal entry functionality
Merged the changes and merges from the troupe
merging with ecomba
Merge remote-tracking branch 'ecomba/master' into dev2
Merge pull request #10 from KeirOsborn/master

journal entry functionality done
styling of the new trips modal
further trip modal styling
More CSS Styling for Trips modal