created the math game and score add
updated merge conflicts
Merge pull request #24 from CTFigueroa/master

We have a game!
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team5