timer started
Merge branch 'master' of https://github.com/kinghenryharris/countdown

Conflicts:
	CountDown/CountDown/Base.lproj/Main.storyboard
.