A LOT. ill tell u tomorrow. nighty night my sweet love!
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_combat.lua
	plugins/carbon_core.lua