merger
updated battle and halos
fuck git
goddamn you git