Added mocked-up controller test.
Refactored Controller.
Adapted TestController to new Controller.
Merge branch 'master' of https://github.com/semmerson/Life.git