Completely refactored the scoring system to allow for client-side grade calculation, updated config files
Fixed merge conflicts