~ to gitigronew
Merge branch 'master' of github.com:caujka/TripJournal
Edit template
minor fixes to edit page