Merge pull request #4 from pppontusw/master

Merge to keep dev and master consistent
Merge branch 'development' of https://github.com/pppontusw/phonegap-web-test into development
fixed a bug that would crash the timer if you pressed end round before the timer started
Merge pull request #10 from pppontusw/development

fixed a bug...