fixed position of some entities
Merge branch 'master' of https://github.com/TerranceN/ATAHackathonW14