smooth collisions
Merged Clarks Movement with Joshs collisions.
Added headers to code.
Commented out acceleration system.
Collisions are smooth.
Modified some components.
Loaded up test walls and obstacles in the main.cpp.

Conflicts:
	src/Gameplay/collision.h
	src/Gameplay/collision_system.cpp
	src/Gameplay/main.cpp
	src/Gameplay/movement_system.cpp
	src/Gameplay/world.cpp
	src/Gameplay/world.h