Bouton cancel
Merge branch 'master' of https://github.com/Emile-Filteau/FilthyEngine

Conflicts:
	public_html/js/Orion.js
	server/server.js