pause button
Merge branch 'timer' into aj_timer
too many changes
Added pause button
Merge branch 'aj_timer' into timer