Merge branch 'master' into dev

gm.tex

@@ -98,7 +98,8 @@ Let's look at an example from a village area:
 \begin{exampletext}
 
 	Villagers have been cutting down trees near a spot sacred to the elves.
-	Negotiations have failed, and now the elves intend to drive the humans out like vermin by burning down their houses.
+	Negotiations have failed, and now the elves intend to drive the humans out like vermin by burning down the human houses.
+	Villagers start responding by attacking any elves, or magic users on sight (they associate all magic with elves).
 
 \end{exampletext}