add timer; test-state
Merge branch 'master' of https://github.com/NPException42/LD31