Merge branch 'master' into layout
layout131002

layout
Merge branch 'feature/bird1204'
git ignore
git ignore
table view 改成 有一個view包著
正常了總算
美工上圖
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