"began styling and remaking of script"
places page can hold jounral entries and has functionality to add new
changing media page and creating journal entry/photo viewer
Commiting master branch after merge with ecomba
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/modal.css.scss
	app/views/journal_entries/show.html.erb
completed css on new journal entry form
"latest commit for media page"
Merge remote-tracking branch 'ecomba/master'
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/modal.css.scss
Media page set up to hold images and journl entries, next step to include instagram
merge
Merge pull request #22 from hoongman/current_master

polylines that work...
trying to ensure dates of places booked on trip do not overlap
merge
fixed problem in gem file
fixed conflict with gem file
Merge remote-tracking branch 'ecomba/master'
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/modal.css.scss
Add new journal entry z-index updated
code to prevent two places having the same dates