preparing to pull
resolved merge conflicts
changed how PlayerModule can be run
refactored PlayerModule to be called Client