таблица
Merge branch 'master' of https://github.com/MariMax/EnergoLink

Conflicts:
	FrontEnd/css/style.css