Changes
Merge branch 'master' of https://github.com/ithillel/eJournal.git