Added second line from A ... this is a local commit before attempting to push up to modified master.
Merge branch 'master' of https://github.com/mmaunu/SourceTreeTesting

Conflicts:
	one.txt
Attempting to merge??