Mirror
Merge branch 'master' of https://github.com/aaronmcdavid/Wesnoth-Creep-War into new_item_method

Conflicts:
	macros/Macros.cfg
	scenarios/Creep_War.cfg

Merged Creep War mirror