Add the GRM Remote Module

src/grmBaatzSegmenter.txx

@@ -24,6 +24,14 @@ namespace grm
 {
 
 	template<class TImage>
+<<<<<<< HEAD:src/grmBaatzSegmenter.txx
+=======
+	BaatzSegmenter<TImage>::BaatzSegmenter() : Superclass()
+	{
+	}
+	
+	template<class TImage>
+>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmBaatzSegmenter.txx
 	void
 	BaatzSegmenter<TImage>::InitFromImage()
 	{

src/grmSegmenter.h

@@ -45,9 +45,14 @@ namespace grm
 		/* Default constructor and destructor */
 		
 		Segmenter(){
+<<<<<<< HEAD:src/grmSegmenter.h
 			this->m_DoFastSegmentation = false;
 			this->m_NumberOfIterations = 0;
 			this->m_Complete = false;
+=======
+			this->m_DoBFSegmentation = true;
+			this->m_NumberOfIterations = 75;
+>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmSegmenter.h
 		};
 		~Segmenter(){};