made another edit
a;sldf
added
as;ldf
a;sdlf
Merge branch 'b2'

Conflicts:
	junk.txt
gitignore