syntax highlighter added :)
Merge branch 'syntax-highlighter' of https://github.com/marcomedina/horror into marcomedina-syntax-highlighter

Conflicts:
	spec/controllers/entries_controller_spec.rb