Content and head style
Merge branch 'master' of https://github.com/MerlinBB/grimm-tales

Conflicts:
	styles/style.less