Merge branch 'syntax-highlighting' of https://github.com/AdamHjerpe/Blog into syntax-highlighting

Signed-off-by: AdamHjerpe <Adam.Hjerpe@hotmail.com>

Conflicts:
	codekit-config.json
	dev/js/highlight.pack.js
	js/highlight.pack.min.js
Merge branch 'syntax-highlighting' of https://github.com/AdamHjerpe/Blog into syntax-highlighting