jon 2013-03-12
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2

Conflicts:
	Nukes of the patriots/Capitalist.cpp
	Nukes of the patriots/Test.vcxproj
	Nukes of the patriots/XML/Config.xml
sda