Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
style
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
styling
Merge pull request #19 from CTFigueroa/master

created angular portions for the mathGame
styling stuff
Merge pull request #20 from chinenyem/master

styling more
updated merge conflict