File 2 a replaced with b
file3 fixed
Final Bug fixes
Merge branch 'bug_fixes'

Conflicts:
	File2.txt
	File3.txt

The bug fixes with the new features resolved