OMG ONLINE WORKS
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2

Conflicts:
	src/main/Player.java
	src/main/World.java