bootstrap forms for new and edit
Merge pull request #6 from kmekler/kirby

bootstrap forms for new and edit
Add sprockets
Merge pull request #7 from kmekler/jackie

changes to index.html and changed images in public folder
Merge pull request #8 from kmekler/jackie

geocoding and tracking markers added to app
Merge pull request #9 from kmekler/jackie

saving markers into database with lorin and Toan's help
Merge pull request #10 from kmekler/jackie

markers changed to json, saves markers on reload
created styling for journal show view
Merge pull request #11 from kmekler/matt

created styling for journal show view
edit and new styling
Merge branch 'master' into kirby
trying to solve merge conflict
Merge pull request #12 from kmekler/kirby

Kirby - edit and new styling
ok the edit and new changes are actually here now
Merge pull request #13 from kmekler/master

Merge pull request #12 from kmekler/kirby
descending selects for forms
precompiled assets locally
changes to css, journal index, and pngs.
commented out merging style conflicts
deleted autp save for journals index (orig)