1екху
мое
ага

Conflicts:

timer.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInt
erfaceState.xcuserstate
	timer/ViewController.h