What does merging do exactly?

Added testing.txt
It's a text file that contains the word "Testing".
Please disregard.
Revert "What does merging do exactly?"

This reverts commit 2b1b72b1d2dc7ed552f4eab711caf2c1c1456a63.
MOVE SPEED FIXED

MOVE SPEED NOT MADE OF SUCK
Camera stops at walls
Resolving merge conflicts