new change by jose
gogo
'tip:'
Merge branch 'master' of https://github.com/joga3001/newApp
whats