fixed combine command, wasn't working because it was checking the
cmdlist for "combine" insted of "ucombine". I'll probably leave this
name and let it stand for unitcombine
First, there was some wierdness and conflicts with github (which, i
don't entirely understand, but appear somewhat resolved)

otherwise I created a method called 'neighboringFriendlyUnits' (whew)
which takes in a war machine and gives back a list of friendly units
directly next to it; this is used for the supply command.