showing the syntax highlighting again
Merge branch 'master' of github.com:rvdkooy/GithubDiffColoring
Merge remote-tracking branch 'ronald/master' into options

Conflicts:
	style.css