Progress commit

getting updates from others, more progress on items
Merge branch 'master' of https://github.com/livingjigsaw/OOP_adventure_project
Merge branch 'master' of https://github.com/livingjigsaw/OOP_adventure_project