moved combat back into the higher-level section, added .mli
added header to combat.mli, commented in some plans