.
Merge branch 'master' of https://github.com/islameldesokycross/Halakat.git