Merge https://github.com/0ADMods/Aristeia
egypt_infantry_javalinist_b

typo fix Nubi we have only two nubi units not 3
Merge https://github.com/0ADMods/Aristeia