oh project, wth
Merge branch 'master' of github.com:hmaon/OpenXcom

Conflicts:
	src/OpenXcom.2010.vcxproj
binary saves: working!

also compiling on Linux