Chris's changes

Updated load torque function, wr, pulley ratio
merge Chris's changes
merge update