add clokc
remote  2_2
add timer
conflict fixed
Merge branch 'master' of https://github.com/RedrockTeam/FrontEnd_exam