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

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

geocoding and tracking markers added to app
saving markers into database with lorin and Toan's help
Merge pull request #9 from kmekler/jackie

saving markers into database with lorin and Toan's help
markers changed to json, saves markers on reload
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
Merge branch 'master' into kirby
trying to solve merge conflict