--just to resolve checkout conflict.
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/client/Client.java

	--sry gaiz. merging.
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Sorry gaiz...more dirty werktreez
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git