Initial import
Added line on branch "featureA" to README.txt
Somehow, I applied my stashed cahnges.
Just goofing around
Clean up branch featureA
Added text "<ADDED ON REMOTE>" to cause merge conflict for testing
Added text "<ADDED ON LOCAL>" to cause merge conflict with remote.
Merge branch 'master' into featureA

Conflicts:
	Git-tests/README.txt
Merge remote-tracking branch 'origin/featureA' into featureA

Conflicts:
	Git-tests/README.txt
README.txt has text "<ADDED ON REMOTE>"
README.txt has text "<ADDED ON LOCAL>"
Merge remote-tracking branch 'origin/featureA' into featureA

Conflicts:
	Git-tests/README.txt
minor change to README.txt
Merge branch 'featureA'
Merge branch 'featureA' into develop
Just trying to clean things up
Modified README.txt.
Not sure where these changes came from.
Cleaned up README.txt again!
Merge remote-tracking branch 'origin/develop' into develop