for some reason master was changed. reverted back
 made potions. not init on spawn yet
nothing added. it thinks i changed things
Merge branch 'sword' into potions

Conflicts:
	debug/CL.write.1.tlog
	debug/bscmake.read.1.tlog
	debug/g_ai.obj
	debug/g_chase.obj
	debug/g_cmds.obj
	debug/g_combat.obj
	debug/g_func.obj
	debug/g_items.obj
	debug/g_main.obj
	debug/g_misc.obj
	debug/g_monster.obj
	debug/g_phys.obj
	debug/g_save.obj
	debug/g_spawn.obj
	debug/g_svcmds.obj
	debug/g_target.obj
	debug/g_trigger.obj
	debug/g_turret.obj
	debug/g_utils.obj
	debug/g_weapon.obj
	debug/game.log
	debug/m_actor.obj
	debug/m_berserk.obj
	debug/m_boss2.obj
	debug/m_boss3.obj
	debug/m_boss31.obj
	debug/m_boss32.obj
	debug/m_brain.obj
	debug/m_chick.obj
	debug/m_flash.obj
	debug/m_flipper.obj
	debug/m_float.obj
	debug/m_flyer.obj
	debug/m_gladiator.obj
	debug/m_gunner.obj
	debug/m_hover.obj
	debug/m_infantry.obj
	debug/m_insane.obj
	debug/m_medic.obj
	debug/m_move.obj
	debug/m_mutant.obj
	debug/m_parasite.obj
	debug/m_soldier.obj
	debug/m_supertank.obj
	debug/m_tank.obj
	debug/p_client.obj
	debug/p_hud.obj
	debug/p_trail.obj
	debug/p_view.obj
	debug/p_weapon.obj
	debug/q_shared.obj
	debug/vc100.idb
	debug/vc100.pdb
	game.sdf
	game.suo
helpd some1 test proj and it fucked my config file
fixed my fucking config file