merge repositories

Armies.sql corrected