Added a JUnit test to test children and added Java doc comments for each test
Fixed mergeconflict in Comment.java