commit my
Merge branch 'master' of https://github.com/TuangWang/Tax

Conflicts:
	.gitignore
	TaxApp.xcodeproj/project.pbxproj
	TaxApp/RootViewController.m
Merge branch 'master' of https://github.com/TuangWang/Tax

Conflicts:
	.gitignore
	TaxApp.xcodeproj/project.pbxproj
	TaxApp/RootViewController.m