some stuff - begining Maman 16
Merge branch 'master' of git@github.com:elvirag/General.git