lj
no message
Merge branch 'scripts' of https://github.com/Decadence/MyProject into scripts
eyt
йцу
Merge branch 'scripts' of https://github.com/Decadence/MyProject into scripts

Conflicts:
	index.php
ггшшщ
Merge branch 'styles' into develop

Conflicts:
	index.php