New branch. Want to try something new.
Update anothertext.txt
Update anothertext.txt
changed anothertext
blah
Merge branch 'diverge' of https://github.com/wdkim/trygit into diverge

Conflicts:
	anothertext.txt