link ally

correct
Merge branch 'master' of https://github.com/mandalorien/xnova-legacies

Conflicts:
	alliance.php