NEW FILES - As usual :D
newfile
Merge branch 'master' of https://github.com/abd-shouman/MergeTest into abd-shouman-master

Conflicts:
	TestMerge.txt
Merge pull request #2 from Papakis/abd-shouman-master

Abd shouman master