hard reset battle_engine, set master to follow origin/push upstream, merge uptoday

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "sots-private"]
 	path = sots-private
 	url = ssh://sotshost:/home/sots-michy/sots-private.git
-[submodule "battle_engine"]
-	path = battle_engine
-	url = https://github.com/SBird1337/battle_engine
 [submodule "g3headers"]
 	path = g3headers
 	url = https://github.com/SBird1337/g3headers
+[submodule "battle_engine"]
+	path = battle_engine
+	url = https://github.com/SBird1337/battle_engine

battle_engine

@@ -1 +1 @@
-Subproject commit a201b518834f0208efdb82ac95b08675f5279950
+Subproject commit 991e2793854c10885382ad325c55ad42a0585f61