Merge remote-tracking branch 'tbibb/master'
merge conflict
Merge remote-tracking branch 'aroth4/master'
fixed classes here and there
small initial leaderboard determination algorithm skeleton code