"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
draft - required refactoring, one error on last leg of route
draft
completed css on new journal entry form
working on twitter
merge
merge
Merge remote-tracking branch 'ecomba/master' into current_master
"latest commit for media page"
merge
Merge remote-tracking branch 'ecomba/master'
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/modal.css.scss
polylines that work...
working on tests
merge
fixed after merge