deleted last line of file1
Merge branch 'develop-test' of https://github.com/david-on-github/SWEN222 into develop-test