Revert "DemoController changed to test branch"
Test merge commit
Merge branch 'master' of https://github.com/andrewabank/tikit