...
collision detection working, bugg: reseting position of player
merge