Merge branch 'master' of https://github.com/unitag/Fil.tr.git

Conflicts:
	README.md

Signed-off-by: Ours-polaire <alexis.laporte@gmail.com>
Merge branch 'master' of https://github.com/unitag/Fil.tr.git