fixed issue 1
fixed issue 2
Merge branch 'fix1' into fix2

Conflicts:
	a.txt

Wrote a.txt to incorporate both fixes