initail
test
Merge branch 'master' of github.com:coa00/comadisq

Conflicts:
	Project.xcconfig
	bin/comaDisqDebug.app/Contents/Info.plist
	bin/comaDisqDebug.app/Contents/MacOS/comaDisqDebug
	comaDisq.xcodeproj/project.pbxproj
	comaDisq.xcodeproj/project.xcworkspace/xcuserdata/coa.xcuserdatad/UserInterfaceState.xcuserstate
	src/comaDisq.cpp
	src/comaDisq.h
	src/main.cpp