Merge branch 'master' into idea3
another move in idea3
a test step on idea4
add line 2 to master/fm.txt
Merge branch 'idea3'

Conflicts:
	file.txt
add line 2 to idea4/i4.txt
Merge branch 'idea4'