adding h to branch testing
adding g
modified text in g
Merge branch 'master' into testing
added i.txt w/text to testing branch. Let's see if this merges if I make changes to same file in main branch.
adding text to i.txt (in master)
Merge branch 'testing'

Conflicts:
	i.txt