Preferencias de cliente, sin terminar.
Merge branch 'master' of https://github.com/ycortes1503/php2014
Merge branch 'master' of https://github.com/ycortes1503/php2014