scrip up to date
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
script up to date again
Merge branch 'master' of https://github.com/vitoldZp/noname
script up to date again