Add Timer, TimeManager
update .gitignore
Merge branch 'timer'