Quad controller
Merge branch 'master' of github.com:magic-upenn/magic2010