edit some issues
Merge branch 'master' of https://github.com/HashAppsLabs/HajjAndOmra