asdasd
Merge branch 'master' of https://github.com/jonwa/Nukes_of_the_Patriots into Jon

Conflicts:
	GUI/Capitalist.cpp
	GUI/Capitalist.h
	GUI/GUIButton.cpp
	GUI/GUIButton.h
	GUI/GUIElement.cpp
	GUI/GUIElement.h
	GUI/GUIImage.cpp
	GUI/GUIImage.h
	GUI/GUIManager.cpp
	GUI/GUIManager.h
	GUI/GUIText.cpp
	GUI/GUIText.h
	GUI/GUIWindow.cpp
	GUI/GUIWindow.h
	GUI/Main.cpp
	GUI/Test.vcxproj
LAWL
Merge branch 'Jon' of https://github.com/jonwa/Nukes_of_the_Patriots into Jon

Conflicts:
	GUI/Capitalist.cpp
	GUI/Capitalist.h
	GUI/GUIButton.cpp
	GUI/GUIButton.h
	GUI/GUIElement.cpp
	GUI/GUIElement.h
	GUI/GUIImage.cpp
	GUI/GUIImage.h
	GUI/GUIManager.cpp
	GUI/GUIManager.h
	GUI/GUIText.cpp
	GUI/GUIText.h
	GUI/GUIWindow.cpp
	GUI/GUIWindow.h
	GUI/Main.cpp
	GUI/Test.vcxproj
	NukesOfThePatriots.vcxproj
	ResourceHandler/NukesOfThePatriots.sln
	ResourceHandler/NukesOfThePatriots.vcxproj
	ResourceHandler/NukesOfThePatriots.vcxproj.filters
	ResourceHandler/ResourceHandler.cpp
	ResourceHandler/ResourceHandler.h
asdasd
NU SKA DET VARA FIXAT!!!!!