commiting journal entry styling
commiting before changing branches
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	db/development.sqlite3
	log/development.log
Merge branch 'master' into dev2

Conflicts:
	app/assets/stylesheets/modal.css.scss
	app/views/journal_entries/new.html.erb
	db/development.sqlite3
	log/development.log
commiting newest styling
Merge pull request #12 from KeirOsborn/dev2

commiting journal entry styling