trial_dismiss
Merge branch 'master' of https://github.com/fabrice123/Backend_sails

Conflicts:
	Backend_project/assets/styles/style.css
	Backend_project/assets/templates/room.html
	Backend_project/views/layout.ejs