updatea
update2
Revert "update2"

This reverts commit 35cc450dbb2ba26d9b6a0c28f9c26c8849875bb7.
Revert "updatea"

This reverts commit d25302497344c5c00e18e50365a5e2901ab12fe3.
Revert "Laatste laatste files"

This reverts commit 473d07000bd823e2a27f9fe3f66dc443cf78b7aa.
Fixed the project

- Fixed the failed merge
- Fixed collision
- Fixed movement
- Remade the map