delete HaiGroup2, 3 class
rm ScoreCalculator class
hierarchy change
hierarchy change
ConsoleClient2 added
conflicts solved