NPC collision now works

npcs and the player overlap properly now
Merge branch 'master' of https://github.com/mak001/java-pokemon