Change items.yml
Merge branch 'master' of https://github.com/adairdavid/SENG403G1

Conflicts:
	test/fixtures/items.yml