MC4 after reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	txt.txt