Merge pull request #24 from jaimieli/bug-fixes

Bug fixes #1
all reset working
Merge branch 'master' into comments
Merge pull request #25 from jaimieli/comments

Comments
Merge branch 'master' into bug-fixes
fixed double modal bug
Merge pull request #26 from jaimieli/comments

fixed double modal bug
Merge branch 'master' into bug-fixes
game ends when timer is 0
Merge pull request #27 from jaimieli/comments

game ends when timer is 0
Merge branch 'master' into bug-fixes
merged with master