firts commit
Merge https://github.com/CharlieRa/reloj_control