minor code conventions related changes
Merge branch 'master' of https://github.com/Rostyk/AppleWatch

Conflicts:
	Countdown/.DS_Store