add view controllers[voyaviewcontroller voyasignupviewcontroller]
delete
Merge branch 'master' of https://github.com/dingt/VOYA

Conflicts:
	VOYA/VOYA.xcodeproj/project.pbxproj
	VOYA/VOYA.xcodeproj/project.xcworkspace/xcshareddata/VOYA.xccheckout
	VOYA/VOYA/Main.storyboard
,,,