Changed entities and tiles
Changed some entity and tile stuff, Merge branch 'master' of https://github.com/cgdot0/RPG