Merge branch 'dev1'
first question in The Game
Timer 0.0.1