merging ethan's dev into phelan's dev
merged with ethan's scores display fix (issue #54 solved). also fixed merge conflicts
Fixed isue #55, had to stop the propagation the click event throughout the dom tree.