Just another test
Merge branch 'master' of https://github.com/mikeleedev/Test

Conflicts:
	Test.txt

After merge
Merge branch 'master' of https://github.com/mikeleedev/Test

Conflicts:
	Test.txt