merge
tex not needed
Merge branch 'master' of https://github.com/nzl-nott/PhD-of-nzl

Conflicts:
	2014 LMFTP Paper/BasicSyntax.lagda
	2014 LMFTP Paper/latex/BasicSyntax.tex