idky i have to commit changes when i run it but ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	Practice Github XNA Game/Practice Github XNA Game/Practice Github XNA
Game/bin/x86/Debug/Practice Github XNA Game.exe
	Practice Github XNA Game/Practice Github XNA Game/Practice Github XNA
Game/bin/x86/Debug/Practice Github XNA Game.pdb
	Practice Github XNA Game/Practice Github XNA Game/Practice Github XNA
Game/obj/x86/Debug/Practice Github XNA Game.exe
	Practice Github XNA Game/Practice Github XNA Game/Practice Github XNA
Game/obj/x86/Debug/Practice Github XNA Game.pdb