small fixes
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2
asdf
Conflicts:
	src/network/Client.java