say something
talk something
OK,now is nothing
one
two
Merge branch 'nbw'

Conflicts:
	another.txt
add a line
.gitignore