no clue what i changed
Merge branch 'master' of https://github.com/TaylorScanlon/Novak
Merge branch 'master' of https://github.com/TaylorScanlon/Novak
add monstars
Merge branch 'master' of https://github.com/TaylorScanlon/Novak
fix messages
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/src/client/main/CodenameNovak.java
	Server/src/server/main/Server.java
MERGE
Merge branch 'master' of https://github.com/TaylorScanlon/Novak