NSTimer *timer
Added timer countdown
Merge branch 'master' into Timer

f