tema2
Merge branch 'master' of https://github.com/jmanuelgg/jmanuelgg.github.io

Conflicts:
	_posts/2014-03-26-tema-2.md