工资

完善
Merge branch 'master' of https://github.com/Brian1900/MagicTools

Conflicts:
	MagicalTools.xcodeproj/project.pbxproj
	MagicalTools/classes/tools/工资计算/BrianPayCountViewController.xib