Moving timer.py to GTG/core
Resolving conflict