.
Merge branch 'master' of https://github.com/GracielaM/WordClock

Conflicts:

Clock.xcodeproj/project.xcworkspace/xcuserdata/dancho.xcuserdatad/UserIn
terfaceState.xcuserstate
	Clock/ViewController.h
	Clock/en.lproj/ViewController.xib