GUI should be done. Also some marionette
Merge branch 'master' of https://github.com/xzel/cis197_final