further defined score controller
Merge branch 'master' into scoresystem
Merge pull request #2 from katherinea/scoresystem

Added scoring system