Delete the "attic" folder-- we have git history for a reason, no need for this folder to remain in master
Merge remote-tracking branch 'origin/master' into Mario/classname_checks Conflicts: qcsrc/server/cl_client.qc qcsrc/server/g_damage.qc qcsrc/server/t_items.qc qcsrc/server/w_common.qc qcsrc/server/waypointsprites.qc
Merge remote-tracking branch 'origin/master' into Mario/assault_mutator Conflicts: qcsrc/server/cl_client.qc qcsrc/server/mutators/mutators.qh qcsrc/server/progs.src
Moving Assault to the mutator API