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

Conflicts:
	timer/Base.lproj/Main_iPhone.storyboard
	timer/ViewController.m