add lines to f1 and f2
Merge branch 'develop-test' of https://github.com/david-on-github/SWEN222 into develop-test