Merge pull request #6 from CliffordAnderson/master

Merge pull request #46 from Ramona2020/master
Merge pull request #47 from Ramona2020/master

Merge pull request #6 from CliffordAnderson/master
Encoding for Une Fantome
Merge pull request #48 from Ramona2020/master

Encoding for Une Fantome
Merge pull request #49 from dlilton/master

Merge pull request #1 from CliffordAnderson/master
Merge pull request #2 from CliffordAnderson/master

Updating 2