Changes to Display, Print, Main and Deleted Child
Merge branch 'master' of https://github.com/endario/git_demo

Conflicts:
	dev/src/Main.java