Updates to stats, challenges
Conflicts resolved
Merge pull request #30 from CorbinFoucart/statsUpdate3

Updates to stats, challenges