Merge branch 'MoreyBranch' into BillyDevBranch
Added point generation to generate weapon/armor function

generateWeapon and generateArmor almost completed