SH
Merge branch 'master' of https://github.com/zeroexu/tercoWars

Conflicts:
	tercoWars/Resources/Images/tercoWars3.pshs
Conflicto