Merge branch 'master' of [email protected]:csce3513/Team18

Conflicts:
	Team18/WindowsGame1/TestProject1/bin/Debug/Content/Tree.xnb
	Team18/WindowsGame1/TestProject1/bin/Debug/Content/test.xnb
	Team18/WindowsGame1/TestProject1/bin/Debug/TestProject1.dll
	Team18/WindowsGame1/TestProject1/bin/Debug/TestProject1.pdb
	Team18/WindowsGame1/TestProject1/bin/Debug/Tree.xnb
	Team18/WindowsGame1/TestProject1/bin/Debug/WindowsGame1.exe
	Team18/WindowsGame1/TestProject1/bin/Debug/WindowsGame1.pdb
	Team18/WindowsGame1/TestProject1/bin/Debug/WindowsGame1_Accessor.exe
	Team18/WindowsGame1/TestProject1/bin/Debug/WindowsGame1_Accessor.pdb
	Team18/WindowsGame1/TestProject1/bin/Debug/test.xnb
	Team18/WindowsGame1/TestProject1/obj/Debug/ResolveAssemblyReference.cache
	Team18/WindowsGame1/TestProject1/obj/Debug/TestProject1.csproj.FileListAbsolute.txt
	Team18/WindowsGame1/TestProject1/obj/Debug/TestProject1.dll
	Team18/WindowsGame1/TestProject1/obj/Debug/TestProject1.pdb
	Team18/WindowsGame1/TestProject1/obj/Debug/WindowsGame1_Accessor.exe
	Team18/WindowsGame1/TestProject1/obj/Debug/WindowsGame1_Accessor.pdb
	Team18/WindowsGame1/WindowsGame1.sln
	Team18/WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/ResolveAssemblyReference.cache