dsdas
Merge branch 'master' of github.com:Pettya/MyRepository

Conflicts:
	deploy.cmd