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
Merge pull request #11 from triathlonboy/dev

Add some styling to the Trip Modal
Trying to fix date issue
commiting before changing branches
Fixed the JS
Merge pull request #13 from triathlonboy/dev

Fixed the JS dates issue
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