time zones.
Setting time interval externally
Merge branch 'master3'
Merged master3 into master
table view.
Merged Sai's master4 Branch...like a boss
Merge branch 'shawna'
Merged branch shawna
Merge branch 'shawna'

Conflicts:
	WorldClock/WorldClock.xcodeproj/project.xcworkspace/xcuserdata/ericprewitt.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'shawna'
where is my merge at ??
additional clock assets
Merge branch 'shawna'
merged branch Shawna
dded label
changed user defaults
changing user preferences