Merge pull request #17 from guywithnose/master

Get grandma working and add score
Add score