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

Conflicts:
	Nukes of the patriots/GameManager.cpp
	Nukes of the patriots/XML/Config.xml
mm
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2
kommunist/kapitalist-knappar
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2

Conflicts:
	Nukes of the patriots/GameManager.cpp