pull down
Merge branch 'master' of https://github.com/mbspears/World-Traveler

Conflicts:
	World Traveler.xcworkspace/xcshareddata/World Traveler.xccheckout
423