conflict resolved?
Merge branch 'master' of https://github.com/whymenot/producealmanac.git
Merge branch 'master' of https://github.com/whymenot/producealmanac.git
createAllItems() added