Merge branch 'master' of https://github.com/juanpablogdl/WP_Framework

Conflicts:
README.md
comments.php
git ignore