Merge remote-tracking branch 'origin/TheBearBranch'

Conflicts:
Wizard-Wars/src/Server.java