Добавление стилей для дива
Merge branch 'styles' into develop
edit functions.js
Merge branch 'scripts' into develop

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

Conflicts:
	css/style.css
Merge branch 'scripts' into develop
Удаляю functions.js
Merge branch 'scripts' into develop
viper 1
viper del
eyt
йцу
Merge branch 'scripts' of https://github.com/Decadence/MyProject into scripts

Conflicts:
	index.php
ггшшщ