Moved some things around

cleans up main, moves battery voltage reader to timer4? (Moved out of
timer 5)
Fixed weird conflict

Conflicts:
	MotorPID.c