cleaning
Merge branch 'master' of ssh://git@github.com/maciejsto/JSProject.git

Conflicts:
	src/backend/config/serviceConfig.js
	src/backend/controllers/users.js