add file2
add file 1
Merge branch 'develop-test' of https://github.com/david-on-github/SWEN222 into develop-test
Added line to file1
Merge branch 'develop-test' of https://github.com/david-on-github/SWEN222 into develop-test
add second line to 2
add third line to 2
add second line to 1
add third line to 1
add line 4,5 to 2
final line to 2
add last line
Merge branch 'develop-test' of https://github.com/david-on-github/SWEN222 into develop-test
Merge pull request #62 from david-on-github/develop-test

Develop test