getLastSharedResourcesTest completed
Merge branch 'master' of github.com:Takhir/ifs

Conflicts:
	server/handlers/getUserLogin.js