worked on substitution (partially working but ugly)
substitution (hopefully) working
Merge branch 'master' of github.com:gnush/spoofax-test

Conflicts:
	test/lamTest.aterm
	test/lamTest.lam
	trans/generate.str
subst (hopefully) working