changed comment
Added Branch fix20
changed to fix21
added hot fix
Merge branch 'fix21'

Conflicts:
	testing.txt
commiting file after failed merge
hotfix testing
add fix22 testing
Merge branch 'fix22'

Conflicts:
	testing.txt