Change opticharger around

Conflicts:
	tools/opticharger