modified:   MERGETEST/Assets/MERGE1.unity
Merge branch 'testMerge' of https://github.com/ElijahHudley/testing3 into testMerge

Conflicts:
	MERGETEST/Assets/MERGE1.unity

	modified:   MERGETEST/Assets/MERGE1.unity