Travail
Merge remote-tracking branch 'origin/Stuff' into Stuff

Conflicts:
	SimWormsProject/Debug/SimWorms.ilk
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo
	SimWormsProject/SimWorms/main.cpp