Issue #231 scenario fixes
Merge branch 'competition' into C2_mohammad-abdulkhaliq_#231_enter_idea
Merge branch 'C2_mohammad-abdulkhaliq_#231_enter_idea' into competition
Issue #231 link fix
Merge branch 'competition' of https://github.com/DevYah/coolsoft-13 into competition