layout changes - design[claire]
conflicts deleted
Merge branch 'master' of github.com:whymenot/producealmanac