Updated Combat
Merge branch 'master' of https://github.com/ShortCircuitGame/Short-Circuit

Conflicts:
	SC-Net/users.db