Merge
Merge branch 'master' of https://github.com/irynaLv/Diploma

Conflicts:
	backend/node_modules/passport-local/LICENSE
	backend/node_modules/passport-local/package.json
	backend/node_modules/passport/LICENSE
	backend/node_modules/passport/README.md
	backend/node_modules/passport/package.json