rex : Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/zzlmilk/008App

Conflicts:
	.DS_Store
	008.xcodeproj/project.pbxproj
	008/Controllers/UserViewContrllers/UserRegisterViewController.m