Change testing
Merge branch 'master' of https://github.com/lkb123/csc181_deliverables

Conflicts:
	Deliverables 1.doc
Delete
Update