wow it's almost at a point where it can be bug tested
Merge branch 'master' of github.com:stuycs-ml7-projects/macguffin