prblem

problme
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameScreen.xaml.cs
	bin/Debug/AppX/GameScreen.xbf
	bin/Debug/AppX/Pong.exe

	bin/Debug/AppX/microsoft.system.package.metadata/S-1-5-21-3897233719-507078443-242857513-1001.pckgdep
	bin/Debug/AppX/vs.appxrecipe
	bin/Debug/GameScreen.xbf
	bin/Debug/Pong.build.appxrecipe
	bin/Debug/Pong.exe
	bin/Debug/Pong.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/GameScreen.g.cs
	obj/Debug/GameScreen.g.i.cs
	obj/Debug/GameScreen.xaml
	obj/Debug/GameScreen.xbf
	obj/Debug/Pong.exe
	obj/Debug/Pong.pdb
	obj/Debug/StartScreen.g.cs
	obj/Debug/StartScreen.g.i.cs
	obj/Debug/StartScreen.xaml
	obj/Debug/XamlSaveStateFile.xml
	obj/Debug/intermediatexaml/Pong.exe
	obj/Debug/intermediatexaml/Pong.pdb