merge
Merge branch 'master' of
https://github.com/jokerServer/LittleMensQuest.git

Conflicts:
	src/Entity.java
Merge branch 'master' of https://github.com/jokerServer/LittleMensQuest.git
Rearranged Entity