+
главная
Merge branch 'master' of https://github.com/rkhairutdinov/fatcat

Conflicts:
	FatCat/Content/less/main.less
	FatCat/Views/Home/Index.cshtml
	FatCat/Views/Home/partial/calculateForm.cshtml
	FatCat/Views/Shared/Layouts/Empty.cshtml
+
мелкие правки
Merge branch 'master' into production