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.
Merge pull request #9 from GabrielAppleby/Adam

Adam
Merge pull request #10 from GabrielAppleby/Adam

Adam
Merge remote-tracking branch 'origin/Adam'
Merge branch 'master' of https://github.com/GabrielAppleby/heartofthecards
MOVE SPEED FIXED

MOVE SPEED NOT MADE OF SUCK
Merge remote-tracking branch 'origin/Adam'
Merge branch 'master' of https://github.com/GabrielAppleby/heartofthecards
Resolving merge conflicts
Forgot to save unity again
Made the rocks right side up