Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/server/Server.java
Merge branch 'master' of
https://github.com/lchrislee/Pokeman-Parody-Adaptation.git