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

Conflicts:
	src/client/Client.java
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
minor edits
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Client Gui commit
Commiting client stuff