Added numbers to the pwm pin mapping in pwm.h
Edited comment in pwm.h
Merge remote-tracking branch 'origin/pwm' into integration