rename in user2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Instruct.txt
	doc/inst.txt
	doc/instruct.txt