init
dic
Dictionary finished
conflict fixed
Merge pull request #5 from webNeat/amine-dev

Amine dev