TEST
Merge branch 'master' of C:\GitHub\alpha

Conflicts:
	alpha/alpha/alphafolder/folder1.txt
	alpha/alpha/alphafolder/folder1/folder2.txt
	alpha/alpha/alphatest.txt