khloud finished s9: functional but not done
 khloud fixed conflicts
Merge pull request #59 from MGhanem/fixing_final_conflicts

Fixing conflicts