Merge branch 'samual/weapons' into Mario/weapons

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/t_items.qc
Simple merge

diff --cc qcsrc/server/t_items.qh
Simple merge