Adding capital A to second line.
Adding lowercase a to second line.
Merge branch 'master' of https://github.com/enssl3/test-repo1

Conflicts:
	a.txt
Merge branch 'testing' of https://github.com/enssl3/test-repo1 into testing