Cool
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hutin/Hutin.sdf
	Hutin/Hutin.v11.suo
	Hutin/Hutin/main.cpp