controller cleanup
Merge branch 'master' into score_summary
Merge pull request #6 from GeoffCrittenden/score_summary

Score summary