[CSS]
Merge branch 'master' of https://github.com/DimTac/PumirProject
Merge branch 'master' of https://github.com/DimTac/PumirProject

Conflicts:
	css/style.css