Unit switch implemented

Gives the player the opportunity to switch between Units when confused
over which is which,
Merge remote-tracking branch 'origin/junk-YS-SeparationsProblem'