first verson for P1
Merge branch 'master' of https://github.com/Bouteloua/dwa_15_p1