Redirect on main page/
Merge branch 'master' of https://github.com/irynaLv/Diploma

Conflicts:
	backend/routes/router.js