Updating the location classes and other Pieces classes
Merge https://github.com/cameronmccord2/cs340
Trying to resolve conflicts
Resolving merge conflicts again