Legere modification
Legere modif
Merge branch 'master' of https://github.com/Erazihel/chat

Conflicts:
	api/index.js