issue commit
second commit
for merging [issue1]
Merge branch 'issue1' [master]

Conflicts:
	readme.txt