ff
Merge branch 'master' of https://github.com/eitanre2/T

Conflicts:
	New Text Document.txt