confilct resolved?
Merge branch 'master' of https://github.com/whymenot/producealmanac.git