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

diff --combined deliverables/report/report.tex
index 36446e8,5c5a165..840184e
--- 1/deliverables/report/report.tex
--- 2/deliverables/report/report.tex
+++ b/deliverables/report/report.tex
@@@ -24,7 -24,6 +24,7 @@@
  \newcommand{\Yard}{\textsc{Yard}}
  \newcommand{\AST}{\emph{AST}}
  \newcommand{\ADT}{\emph{ADT}}
 +\newcommand{\Clean}{\emph{Clean}}
  
  \let\tt\texttt
  
@@@ -43,6 -42,8 +43,8 @@@
  
  \input{ext.tex}
  
+ \input{eval.tex}
+ 
  \newpage
  \section{Appendices}
  \subsection{Grammar}
@@@ -56,8 -57,4 +58,8 @@@
        firstline=6,
        lastline=42]{../../AST.dcl}
  
 +\newpage
 +\subsection{Inference rules} \label{sec:infRules}
 +\input{infRules.tex}
 +
  \end{document}