20140216

Pequeñas mejoras
Merge branch 'master' of https://github.com/arturios/magazine

Conflicts:
	css/wordpress.css