Change in P1
Local change in P2.
Merge branch 'develop-test' of
https://github.com/david-on-github/SWEN222 into develop-test

Conflicts:
	README.md
Merge pull request #61 from david-on-github/develop-test

Develop test