Ran ocamllex on scanner
Merge scanner.ml