another step on idea2
step 3 on idea2
add idea2/i2.txt
Merge branch 'idea2'
change some words to vimdifftest in file.txt
change some words to master in file.txt
Merge branch 'tryvimdiff'

Conflicts:
	file.txt