switched to prism for syntax highlighting
added the prism files
fixed merge conflict