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

Conflicts:
	backend/app.js
	backend/models/user.js
Updated routes