fixed conflict in testscript sr
Merge branch 'master' of https://github.com/bluewish07/EECS381_p6
fixed testscript conflict