More work on gameplay
resolve merge conflicts
Merge branch 'master' of github.com:csci201/final-project
Merging Ben's changes with the repo.