herald??? Put that gun down!
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameFiles1.html