(Xronos) Adding a better controller, and other changes
Merge branch 'master' of git@github.com:orcc/xronos.git