add a line
add a line
diff from master
Merge branch 'testing'

Conflicts:
	README
a kitty
resolve conflict