Testing improvements- C/C++
Resolved Conflicts
Fix

Merge branch 'master' into Testing-Scripts

Conflicts:
	TestScripts/C Tests.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate
	TestScripts/Cpp Tests.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate
Merge pull request #17 from nasa/Testing-Scripts

Testing improvements- C/C++