added baseDR and totalDR to Destructible. Messed with item bonuses. Added function *Map::createCombatKnife() to be implemented by somebody else
added damage reduction to destructible, messed with item bonuses, made a createCombatKnife function in Map.cpp that isnt used yet, and fixed merge conflicts this generated
Merge branch 'master' of https://github.com/AstroTeam/Game