Merge origin/master

Conflicts:
	TheGuardiansOfHellfire/src/TGH/view/StartProgramView.java
	TheGuardiansOfHellfire/src/theguardiansofhellfire/TheGuardiansOfHellfire.java