added code from the mpi14 library for parallel mpi communication with a nice wrapper interface

src/amdis/common/parallel/Communicator.hpp

@@ -19,6 +19,7 @@
 #include <amdis/common/parallel/RecvDynamicSize.hpp>
 #include <amdis/common/parallel/MpiTraits.hpp>
 
+<<<<<<< HEAD
 namespace AMDiS {
 namespace Concepts {
   template <class T>
@@ -32,6 +33,10 @@ namespace Mpi
     int value = 0;
   };
 
+=======
+namespace AMDiS { namespace Mpi
+{
+>>>>>>> ed87e4837c806d46ae68d65b90cbe50fb31d2c58
   class Communicator
   {
   public: