Little corrections
merge
term parser + term ast, moving rewrite system ast into rewrite_system
merge