Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Fixes stacking controller inputs, adds slightly more robust confirmation class behavior
Merge pull request #35 from jbbrokaw/fix-controller-view

Fix controller view