Ночная точка)
Merge branch 'master' of https://github.com/yarova/Test

Conflicts:
	styles/contentStyles.css