Added naiive collision with tiles
updated map and removed debugging code from gameobject
merge