попытка все запустить
Merge branch 'master' of github.com:MariMax/Farmers
profile
Merge branch 'master' of github.com:MariMax/Farmers

Conflicts:
	controllers/userController.js
	frontEnd/scripts/directives/loggedHeader.js
	frontEnd/scripts/services.js