merging conflicts and adding ocaml stuff
Added tuareg mode