Config replace complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	pyng.py