yolo
commit
Merge branch 'master' of https://github.com/WorldTag/iOS
merge
Conflicts:
	World/Obj-C Map/Base.lproj/Main.storyboard