no message
Merge branch 'develop' of https://github.com/jinying0218/BuildingMaterials

* 'develop' of https://github.com/jinying0218/BuildingMaterials:
  搭建登陆页面

Conflicts:
	BuildingMaterials.xcworkspace/xcuserdata/Ariel.xcuserdatad/UserInterfaceState.xcuserstate
Merge pull request #1 from jinying0218/master

登陆页面
Merge pull request #2 from jinying0218/develop

Merge pull request #1 from jinying0218/master
no message