first commit in bugfixes branch
master changes
for ,merge demo
Merge branch 'bug-fixes'

Conflicts:
	test.txt.txt