het is af
Merge branch '1.1'
Merge branch 'master' of https://github.com/Moussa112/Kapsalon