Made the game more game-like, fixed some bugs.
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions