change
Merge branch 'master' of https://github.com/Hunter6/SoyKB_DEV

Conflicts:
	SoyKB_DEV.xcodeproj/project.pbxproj

SoyKB_DEV.xcodeproj/project.xcworkspace/xcuserdata/digbiolab.xcuserdatad
/UserInterfaceState.xcuserstate
	SoyKB_DEV/Base.lproj/Main.storyboard
	SoyKB_DEV/FunctionViewController.h
	SoyKB_DEV/FunctionViewController.m