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

Conflicts:
	Clock/ViewController.h
	Clock/ViewController.m
up