avancement 18_02_14
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git