commit 1 test
1er commit form me
Merge branch 'master' of https://github.com/Cepheus/Short-Story

Conflicts:
	TestCommit.txt
Merge branch 'master' of https://github.com/Cepheus/Short-Story