修改冲突及首页字体大小

修改冲突及首页字体大小
Merge branch 'master' of https://github.com/xrj277427509/MySmartBattery

Conflicts:
	MySmartBattery.xcodeproj/project.pbxproj
	MySmartBattery/MySmartBattery-Info.plist