6
Merge branch 'master' of https://github.com/Danitz123/Test1 into HTTPS-FTPS

Conflicts:
	polarssl-1.3.2/Main 1.txt