Merge branch 'master' of github.com:iacademi/formacion.internetacademi.com into gh-pages

Conflicts:
	_posts/landings/2013-11-27-test2.html