Laptop Update
Merge branch 'KanaMatchingGame' of github.com:Rubiks14/SdlDemo into KanaMatchingGame

Conflicts:
	SdlDemoProject.sdf
	SdlDemoProject.v12.suo
	SdlDemoProject/SdlDemoProject.vcxproj.filters