Merge pull request #3 from lexwebb/master

rebase
Moved call to remove player from playerClass HashMap to above switch statement

Fixed code duplication
Merge pull request #7 from Diremonsoon09/master

Main.java quick update! fixed some possible code duplication