Merging changes for AATestSuite.java (Having Git issues!)
Merge branch 'master' of https://github.com/SEPRGroup/SEPRProject