boom
Merge remote-tracking branch 'origin/master'

Conflicts:
	CardGame_v2.sdf
	CardGame_v2.suo
	CardGamev2/Debug/CardGamev2.log
	CardGamev2/Debug/main.obj
	CardGamev2/Debug/p1controls.obj
	CardGamev2/Debug/p2controls.obj
	CardGamev2/Debug/vc100.idb
	CardGamev2/Debug/vc100.pdb
	CardGamev2/main.cpp
	CardGamev2/utils/p1controls.cpp
	Debug/CardGamev2.exe
	Debug/CardGamev2.ilk
	Debug/CardGamev2.pdb