Merge remote-tracking branch 'origin/master'

author Sarah Westcott <mothur.westcott@gmail.com>

Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)

committer Sarah Westcott <mothur.westcott@gmail.com>

Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)
author Sarah Westcott <mothur.westcott@gmail.com>
Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)
committer Sarah Westcott <mothur.westcott@gmail.com>
Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)
diff --cc Mothur.xcodeproj/project.pbxproj
Simple merge
diff --cc cooccurrencecommand.cpp
Simple merge
author	Sarah Westcott <mothur.westcott@gmail.com>
	Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)
committer	Sarah Westcott <mothur.westcott@gmail.com>
	Thu, 13 Dec 2012 21:36:13 +0000 (16:36 -0500)
		1	2
Mothur.xcodeproj/project.pbxproj	patch \|	diff1 \|	diff2 \|	blob \| history
cooccurrencecommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history