more?
what now?
Merge branch 'master' of https://github.com/alexupton/Titans1

Conflicts:
	Titans/Titans/Battle.cs