Undo Excalibur

Undo excalibur
Merge branch 'master' of https://github.com/MarkWaldron/darkstar

Conflicts:
	scripts/globals/items/excalibur.lua