Merge Dan and Truong v1
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade

Conflicts:
	WindowsGame2/WindowsGame2/WindowsGame2/bin/x86/Debug/WindowsGame2.exe
	WindowsGame2/WindowsGame2/WindowsGame2/bin/x86/Debug/WindowsGame2.pdb
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/ContentPipeline-{E0D6847D-8A3E-4C80-8D10-0F3AE89A01B6}.xml
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/SWE.csproj.FileListAbsolute.txt
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/WindowsGame2.exe
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/WindowsGame2.pdb
	WindowsGame2/WindowsGame2/WindowsGame2Content/obj/x86/Debug/WindowsGame2Content.contentproj.FileListAbsolute.txt
Final Merge of Truong and Dan's work into 1 main project (please work from this date on from this project)