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

Conflicts:
	Nukes of the patriots/Capitalist.cpp
	Nukes of the patriots/Capitalist.h
	Nukes of the patriots/Communist.h
	Nukes of the patriots/GUIButton.h
	Nukes of the patriots/GUIImage.cpp
	Nukes of the patriots/GUIImage.h
	Nukes of the patriots/GameManager.h