правки
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css