Merge branch 'master' of https://github.com/evhtlt/NEW

Conflicts:

timer.xcodeproj/project.xcworkspace/xcuserdata/denisborzenkov.xcuserdata
d/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/evhtlt/NEW

Conflicts:

timer.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInt
erfaceState.xcuserstate
	timer/Base.lproj/Main_iPhone.storyboard
	timer/Images.xcassets/ButtonUnset.imageset/Contents.json
	timer/Images.xcassets/ButtonUnset.imageset/b_retina_1-1.png
	timer/Images.xcassets/ButtonUnset.imageset/b_retina_1.png
	timer/ViewController.m