Added local changes
Added improved movement with collisions
Commited fixes on index and mapMatrix
fixed conflicts