commiting journal entry styling
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
fixed dates
merging
Merge pull request #14 from hoongman/current_master

fixing date entry
ok
draft
started on development for adding routes to a map
Merge pull request #15 from hoongman/current_master

fixing dates
rake db
commiting some CSS tweaks
changing to postgresql for deployment
added last place
merge
commitz
Merge pull request #16 from raven-valentine/master

added previous place
commitz
changed migrations