Merge branch 'master' of https://github.com/dopefishh/cc1516

diff --cc sem.icl
index f0241e1,c5e14f3..19092df
--- 1/sem.icl
--- 2/sem.icl
+++ b/sem.icl
@@@ -59,9 -59,9 +59,9 @@@ instance toString SemError wher
                toString t1, ". Given: ", toString t2]
  
  sem :: AST -> SemOutput
 -sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 0) of
 +sem (AST vd fd) = case evalStateT m ('Map'.newMap, getRandomStream 1) of
      Left e = Left [e]
-     Right (vds, fds) = Right (AST vds fds)
+     Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
  where 
      m :: Env (([VarDecl], [FunDecl]))
      m = (mapM semVarDecl vd) >>= \vds ->