BEC
Merge branch 'master' of github.com:Gamewalker/herofactory

Conflicts:
	@BEC/Config/Config.cfg