jamen dåsåå
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2

Conflicts:
	Nukes of the patriots/GUIEditField.cpp
	Nukes of the patriots/GUIEditField.h
	Nukes of the patriots/GUIElement.cpp
	Nukes of the patriots/GUIElement.h
	Nukes of the patriots/GameManager.cpp
	Nukes of the patriots/GameManager.h