uppdaterad
bajs
Merge branch 'master' of https://github.com/jonwa/Nukes_of_the_Patriots

Conflicts:
	Nukes of the patriots/Capitalist.cpp
	Nukes of the patriots/Debug/Animation.obj
	Nukes of the patriots/Debug/CL.read.1.tlog
	Nukes of the patriots/Debug/CL.write.1.tlog
	Nukes of the patriots/Debug/Capitalist.obj
	Nukes of the patriots/Debug/Communist.obj
	Nukes of the patriots/Debug/EventHandler.obj
	Nukes of the patriots/Debug/GUIButton.obj
	Nukes of the patriots/Debug/GUIElement.obj
	Nukes of the patriots/Debug/GUIImage.obj
	Nukes of the patriots/Debug/GUIManager.obj
	Nukes of the patriots/Debug/GUIText.obj
	Nukes of the patriots/Debug/GUIWindow.obj
	Nukes of the patriots/Debug/GameManager.obj
	Nukes of the patriots/Debug/Main.obj
	Nukes of the patriots/Debug/Menu.obj
	Nukes of the patriots/Debug/President.obj
	Nukes of the patriots/Debug/Randomizer.obj
	Nukes of the patriots/Debug/ResourceHandler.obj
	Nukes of the patriots/Debug/SuperPower.obj
	Nukes of the patriots/Debug/Test.exe
	Nukes of the patriots/Debug/Test.log
	Nukes of the patriots/Debug/Test.pdb
	Nukes of the patriots/Debug/tinyxml2.obj
	Nukes of the patriots/Debug/vc100.idb
	Nukes of the patriots/Debug/vc100.pdb
	Nukes of the patriots/GUIManager.cpp
	Nukes of the patriots/Test.sdf
	Nukes of the patriots/Test.suo
	Nukes of the patriots/ipch/test-320e11cb/test-2434c52c.ipch