Progress Commit

still working on items, syncing other's work to my own device
Merge branch 'master' of https://github.com/livingjigsaw/OOP_adventure_project