Merge pull request #13 from Bkahler/master

added journal form