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

Conflicts:
	src/dataStore/NetworkPlayer.java
Many changes...trying to send player over to the client now
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git