testing modifiying file in feature branch and committing
feature2 branch
Merge branch 'develop' of https://github.com/merchantwarehouse/TestingGitHub into develop

Conflicts:
	TestingGitHub/ReadMe.txt
merging readme