added labels to score boxes
fixed the merge issues with the tests
all tests but resetclick  now pass
Merge pull request #10 from JoshuaWordSmith/joshsFork

Joshs fork