motors finish moving at same time
Merge remote-tracking branch 'origin/master'

Conflicts:
	PNP.c