конфиги
пакеты
Merge branch 'master' into production

Conflicts:
	.gitignore
+
Merge branch 'master' into production
Merge branch 'master' into production

Conflicts:
	FatCat/Views/Shared/Layouts/Empty.cshtml
Merge branch 'master' into production
Merge branch 'master' into production
fix
Merge branch 'master' into production
+
Merge branch 'production' of https://github.com/rkhairutdinov/fatcat into production

Conflicts:
	FatCat/Views/Home/partial/calculateForm.cshtml
Merge branch 'master' into production
Merge branch 'master' into production
мелочи
Merge branch 'production' of https://github.com/rkhairutdinov/fatcat into production

Conflicts:
	FatCat/Views/Result/results.cshtml
плашки соцсети
Merge branch 'production'