create a new branch dev
modified the readme.txt to test modified time of readme.txt in master
add info in branch
modify the readme file in branch
Merge branch 'feature1'

Conflicts:
	readme.txt