items for final game
Merge branch 'master' of https://github.com/markc1995/group10