Clean up
Merge branch 'master' of github.com:katherineng/terrace
Add skeleton of setup screens and game builder