Extended weapon class and logic to give the ability to keep weapons until used up.

Slightly changed weapon class adding a damage attribute.
Moved around things in weaponList to remove the use of big if cases.
Changed player class adding the possibility to have weapons and extended getDamage so it will use the weapon dmg as extra damage for now
Removed some template comments