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

Conflicts:
	Clock/ColorPicker.m
up
Merge branch 'master' of https://github.com/GracielaM/WordClock

Conflicts:
	Clock/ColorPicker.m