connection bdd
Merge branch 'master' of https://github.com/MrWormy/CampusNet

Conflicts:
	server.js