Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina

diff --cc fleet.txt
Simple merge

diff --cc order.lst
index b561b3c725fc5567f6ef884bc29c7af71e57b4e0,c42c7b7a78dd73388159f441430eea722da30418..43fceb36f366da894def3e8f873a2e5b6fdc9e12
--- 1/order.lst
--- 2/order.lst
+++ b/order.lst
@@@ -36,8 -36,8 +36,9 @@@ benares-battle.tx
  patna.txt
  intelligence2.txt
  factory.txt
+ weavwers.txt
  truck.txt
 +weavers.txt
  fleet.txt
  embassy.txt
  chess.txt