Hmm
Merge remote-tracking branch 'origin/Brandon' into Brandon

Conflicts:
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo
	SimWormsProject/SimWorms/Maps/country/map.png
	SimWormsProject/SimWorms/OOSDL/Mouse.cpp
	SimWormsProject/SimWorms/OOSDL/View.cpp
	SimWormsProject/SimWorms/OOSDL/View.h
	SimWormsProject/SimWorms/OOSDL/Window.cpp
	SimWormsProject/SimWorms/OOSDL/Window.h
	SimWormsProject/SimWorms/SimWorms.vcxproj
	SimWormsProject/SimWorms/SimWorms.vcxproj.filters
	SimWormsProject/SimWorms/Terrain.cpp
	SimWormsProject/SimWorms/Terrain.h
	SimWormsProject/SimWorms/main.cpp