sdsd
branch 1
cgcvg
dfgfdg
gfdgfdg
dsfdf
vcxv
sdfdsf
Merge branch 'Branch1'

Conflicts:
	Test.txt
Merge branch 'master' of https://github.com/tarek-bedegaming/tarek