My update

Server & Player
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/BananaJ/Player.java