updated child
Merge branch 'master' of https://github.com/rogperez/parent
Merge branch 'master' of https://github.com/rogperez/parent