commit for merge
Merge branch 'master' of https://github.com/ICAD/KARD into develop

Conflicts:
	.DS_Store
kard: fix merge issue
deleted user data in xcode projects

Conflicts:
	.DS_Store
	KARD.xcodeproj/project.xcworkspace/xcuserdata/tyler.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'develop' of https://github.com/ICAD/KARD into develop

Conflicts:
	.DS_Store
	KARD.xcodeproj/project.xcworkspace/xcuserdata/tyler.xcuserdatad/UserInterfaceState.xcuserstate
Testing xcode gitignore
Testing gitignore
removed user data in xcode project