Pong
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pong/Pong/Pong.sdf
	Pong/Pong/Pong.sln
	Pong/Pong/Pong/Debug/Pong.tlog/CL.read.1.tlog
	Pong/Pong/Pong/Debug/Pong.tlog/Pong.lastbuildstate
	Pong/Pong/Pong/Debug/Pong.tlog/cl.command.1.tlog
	Pong/Pong/Pong/Debug/Pong.tlog/link.read.1.tlog
	Pong/Pong/Pong/Debug/vc120.idb
	Pong/Pong/Pong/Debug/vc120.pdb
	Pong/Pong/Pong/Pong.vcxproj
	Pong/Pong/Pong/Pong.vcxproj.filters