some project files from home
Merge remote-tracking branch 'origin/master'
timer in controller