css
Merge branch 'gh-pages' of github.com:landitus/chaltel-contenidos into gh-pages

Conflicts:
	_config.yml
	_layouts/default.html