Further Setup of stats page
Merge branch 'stats' into dev

Conflicts:
	templates/teamDetail.html

Adding in stats changes
Merge branch 'pleaseMergeThis' of https://github.com/blair-robot-project/Scoutmaster-9000-web into pleaseMergeThis

Antares screwed up.
Fixed JSON ordering