Different tower types
Merge branch 'master' of https://github.com/rbellido/Project

Conflicts:
	redesigned/team.h