added highlighting
bugs
fixing merge conflicts
syntax highlighting finished