Final post

Terminado
Merge branch 'master' of https://github.com/fernanz/GHSite

Conflicts:
_posts/2014-11-08-escriba-maya.md
Merge branch 'master' of https://github.com/fernanz/GHSite

Conflicts:
	_posts/2014-11-08-escriba-maya.md
Merge branch 'master' of https://github.com/fernanz/GHSite