Merge remote-tracking branch 'origin'

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

Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)

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

Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)
author Sarah Westcott <mothur.westcott@gmail.com>
Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)
committer Sarah Westcott <mothur.westcott@gmail.com>
Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)
diff --cc Mothur.xcodeproj/project.pbxproj
Simple merge
diff --cc shhhercommand.cpp
Simple merge
author	Sarah Westcott <mothur.westcott@gmail.com>
	Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)
committer	Sarah Westcott <mothur.westcott@gmail.com>
	Wed, 14 Aug 2013 16:20:47 +0000 (12:20 -0400)
		1	2
Mothur.xcodeproj/project.pbxproj	patch \|	diff1 \|	diff2 \|	blob \| history
shhhercommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history