Add up Marmoset points properly
Merge git://github.com/cs136/seashell
Merge pull request #124 from kpalway/master

Add up Marmoset points properly