Awful
all my files restored
Merge branch 'master' of https://github.com/Lefty-San/WorldClock

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