changed fix.txt
made fix
Merge branch 'bug-fix'

Conflicts:
	fix.txt