Удаляю файл скрипта
Merge branch 'scripts' into develop

Conflicts:
	js/functions.js
удаляем индекс из девелопа
Добавляем zoom
Merge branch 'scripts' into develop

Conflicts:
	css/style.css
Удаление style.css
Merge branch 'scripts' into develop
Удаляю functions.js
L
Merge branch 'scripts' into develop
viper 1
viper del
test
Merge branch 'viper_br' into develop