Fixed issue in controller
Merge branch 'master' of https://github.com/ggj14/dwarf-squad