pruebas personales
10/05/2013
Merge branch 'master' of https://github.com/kaibalam/personal