Small commit
Merge branch 'master' of https://github.com/Shuliyey/space_road

Conflicts:
	Final/LabGame.cs
	Final/Project.v12.suo
	Final/bin/DebugWinRTXaml/AppX/vs.appxrecipe
	Final/bin/DebugWinRTXaml/AppxManifest.xml
	Final/bin/DebugWinRTXaml/Content/myShader.tkb
	Final/bin/DebugWinRTXaml/Project.WinRTXaml.exe
	Final/bin/DebugWinRTXaml/Project.WinRTXaml.pdb
	Final/bin/DebugWinRTXaml/Project.build.appxrecipe
	Final/bin/DebugWinRTXaml/resources.pri
	Final/obj/Debug/Content___Car.x.deps
	Final/obj/Debug/Content___SpaceShip.dae.deps
	Final/obj/Debug/Content___justigue league flying vehicle.obj.deps
	Final/obj/Debug/Content___justigue_league_flying_vehicle.mtl.deps
	Final/obj/Debug/Content___myShader.fx.deps
	Final/obj/Debug/Content___space.jpg.deps
	Final/obj/Debug/Instructions.xaml
	Final/obj/Debug/MainMenu.xaml
	Final/obj/Debug/Project.WinRTXaml.exe
	Final/obj/Debug/Project.WinRTXaml.pdb
	Final/obj/Debug/Project.csproj.FileListAbsolute.txt
	Final/obj/Debug/Project.csprojResolveAssemblyReference.cache
	Final/obj/Debug/ProjectArchitectures.txt
	Final/obj/Debug/XamlSaveStateFile.xml
	Final/obj/Debug/XamlTypeInfo.g.cs
	Final/obj/Debug/intermediatexaml/Project.WinRTXaml.pdb
	Final/obj/Debug/layout.resfiles
	Final/obj/Debug/layout.resfiles.intermediate
	Final/obj/Debug/pri.resfiles
	Final/obj/Debug/pri.resfiles.intermediate
	Final/obj/Debug/priconfig.xml
	Final/obj/Debug/priconfig.xml.intermediate