second написали :)
Merge branch 'scripts' of https://github.com/Decadence/MyProject into scripts

Conflicts:
	index.php