incorporated conference in the state thing
Merge branch 'master' of https://github.com/SuperSimen/kitten-mittons