Merge https://github.com/cs136/seashell
Fixed bug with public test total counting. Fixed bug with previous results not disappearing when resubmitting.
Merge pull request #103 from kpalway/master

Bugfixes for Marmoset results
[frontend] Adjust marmoset handling.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/frontend/js/model/project.js
Merge pull request #104 from e45lee/master

Marmoset Result Reworking
Merge remote-tracking branch 'origin/master' into staging