finished work on situations
Merge pull request #94 from keyvan-m-sadeghi/master

finished work on situatiobns