IHNIWIM
Merge branch 'Desarrollo' of https://github.com/EscuelaIt/Wordpress-Boilerplate into Desarrollo

Conflicts:
	index.php
IHNIWID