修改提交

修改
Merge branch 'master' of https://github.com/Brian1900/MagicTools

Conflicts:
	MagicalTools.xcodeproj/project.pbxproj
	MagicalTools/classes/main/BrianMainViewController.xib
	MagicalTools/classes/tools/汇率/BrianExchangeViewController.h
	MagicalTools/classes/tools/汇率/BrianExchangeViewController.m
	MagicalTools/classes/tools/汇率/BrianExchangeViewController.xib