tester
no message
Merge branch 'master' of https://github.com/fabrice123/Backend_sails

Conflicts:
	.idea/workspace.xml
	Backend_project/package.json
	Backend_project/views/homepage.ejs
	Backend_project/views/layout.ejs