架構 只剩present
改個小東西ㄎ
Merge branch 'feature/bird1204'
我做好多我不知道要怎麼解釋
Merge branch 'master' into feature/bird1204
full screen map view
Merge branch 'feature/bird1204'
Merge branch 'feature/bird1204'
Merge branch 'feature/bird1204'

Conflicts:
	.gitignore
	XpendAll.xcodeproj/project.pbxproj
	XpendAll/AppDelegate.m
	XpendAll/Base.lproj/Main.storyboard
	XpendAll/ViewController.h
	XpendAll/ViewController.m
	XpendAll/XpendAll-Info.plist
del all
reset
help some one DONE
Merge branch 'master' into feature/bird1204