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

This reverts commit f76662eb738276d4d6f2f75b806aa0f291cb7986, reversing
changes made to f2f06328d5951b643c2a0cfb3a517fdac04892e5.
Minor Changes
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