del 2
55
Merge branch 'my' of https://github.com/Gorets/test

Conflicts:
	1.php