added new design"
Merge branch 'karma' of https://github.com/loed-idzinga/lifefire into karma