added function for the long if statements
Merge branch 'first-branch' of https://github.com/krlmozx/SoftwareEngineering into first-branch