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

Conflicts:
	GUI - Omgjord/Capitalist.cpp
	GUI - Omgjord/Capitalist.h