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

Conflicts:
	public_html/js/Orion.js
	public_html/js/model/OrionGame.js

Signed-off-by: Emile-Filteau <emile.filteau@gmail.com>