HMHMHM
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2

Conflicts:
	Nukes of the patriots/Communist.cpp
	Nukes of the patriots/GUIButton.cpp
	Nukes of the patriots/GUIEditField.cpp
	Nukes of the patriots/GUIText.cpp
	Nukes of the patriots/Main.cpp
	Nukes of the patriots/Menu.cpp
	Nukes of the patriots/Menu.h
	Nukes of the patriots/SuperPower.cpp
	Nukes of the patriots/Test.vcxproj.filters