clock in all collection view
ksjfdl
 I lost the storyboard :(
Merge branch 'shawna'

Conflicts:
	WorldClock/WorldClock.xcodeproj/project.xcworkspace/xcuserdata/ericprewitt.xcuserdatad/UserInterfaceState.xcuserstate