99%* working collision's!*

 *(the math used to detect if there is a collision AT ALL is a little wonky, but that can be fixed.)
Merge branch 'master' of https://github.com/cebarks/DEngine

Conflicts:
	src/main/java/net/dengine/world/entity/EntityPlayer.java