really serious
Merge branch 'master' of https://github.com/goldido87/WebServicesProject

Conflicts:
	server.js