Revert "test commit"

This reverts commit 6719fed06e07737ac1c49b1c57208e12e7e78dc3.
Merge branch 'master' of https://github.com/luconis/GameFiles

Conflicts:
	thisisatestfile.txt