Output.testplan added and expectedOutput modified
Merge branch 'OP' of https://github.com/bdanoit/csci265-ass2 into OP