Merge branch 'csystems'

# Conflicts:
#	cubicaltt.el
#	examples/helix.ctt

diff --cc Exp.cf
Simple merge

diff --cc Main.hs
Simple merge

diff --cc Resolver.hs
Simple merge

diff --cc cubicaltt.el
index 0facab0725c7eaa984a75039bc7f9b21bbbb8901,c45a39f0e70caa8b0d5477ef8b4131078389d042..23923fe1a358fbbb15d222d1195e0512df94f966
--- 1/cubicaltt.el
--- 2/cubicaltt.el
+++ b/cubicaltt.el
@@@ -1,6 -1,6 +1,6 @@@
  ;; define several class of keywords
  (setq ctt-keywords '("hdata" "data" "import" "mutual" "let" "in" "split"
-                      "with" "module" "where" "U") )
 -                     "module" "where" "U" "opaque" "visible") )
++                     "with" "module" "where" "U" "opaque" "visible") )
  (setq ctt-special '("undefined" "primitive"))
  
  ;; create regex strings

diff --cc examples/helix.ctt
Simple merge