re merge request 
I intend to make Exercise machine a somewhat more detailed explanation of the machine aspects of exercise machines.  I would have subordinated it to Exercise equipment myself otherwise.  That page can still have a cursory coverage of this subject, and will include all of the other kinds of equipment that do not involve machines.