stuff
Merge branch 'master' of https://github.com/ewadav/ProjectZ

Conflicts:
	Project Z/bin/Block.class
	Project Z/bin/Item.class
	Project Z/bin/Main.class
	Project Z/src/Main.java
PlayerX and Player Y is now the point of contact for position