поиск сделал
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styles.css
	links.php