New versions including both PWM and ADC
Merge branch 'master' into Nico

Conflicts:
	Lab3.c