added a method to calculate scores
tests
added adding comments functionality
added comments and changed display a bit
fixed conflict