Merge branch 'master' of mdlowis.com:~/git/proto/obnc

diff --cc cerise/src/grammar.c
Simple merge

diff --cc cerise/tests/Module.m
index 035f2c271c21ad3de3df75acd30c10872525981a,f0c7e9a091969454e3c504dcde97d92720074f01..a7e11034d34404c838d01f53eb0b49ea20c1a710
--- 1/cerise/tests/Module.m
--- 2/cerise/tests/Module.m
+++ b/cerise/tests/Module.m
@@@ -29,13 -30,7 +30,8 @@@ procedure Foo*(e : Int, z : Int) : In
    var
      z : Int
      q : array 5 of array 10 of Int
- 
- #  procedure Bar() : Int
- #  begin
- #  end
- 
  begin
 +#  e = q;
    c = 1;
    z = 2;
    return z;