change done
changed here also
Resolved conflict

Conflicts:
	hi.rb
Merge branch 'child'