First commit. #1
First commit. #2
Second commit. #1
Merge branch 'develop-issue-2' into develop

Conflicts:
	Test.txt