small changes
Merge branch 'master' of github.com:JohnBuonomo/Field-Journal
Merge branch 'master' of github.com:JohnBuonomo/Field-Journal
Merge branch 'master' of github.com:JohnBuonomo/Field-Journal
cleanup after merge