diff --git a/Dokumentation/Hazard_PAP.gif b/Dokumentation/Hazard_PAP.gif
new file mode 100644
index 0000000..13b88e9
Binary files /dev/null and b/Dokumentation/Hazard_PAP.gif differ
diff --git a/Dokumentation/Hazard_PAP.pdf b/Dokumentation/Hazard_PAP.pdf
deleted file mode 100644
index 426d371..0000000
Binary files a/Dokumentation/Hazard_PAP.pdf and /dev/null differ
diff --git a/Dokumentation/Wichtisgte_Klassen/KV_Print().gif b/Dokumentation/Wichtisgte_Klassen/KV_Print().gif
new file mode 100644
index 0000000..f12ea7e
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/KV_Print().gif differ
diff --git a/Dokumentation/Wichtisgte_Klassen/Wertetabelle_Print().gif b/Dokumentation/Wichtisgte_Klassen/Wertetabelle_Print().gif
new file mode 100644
index 0000000..ba4e12e
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/Wertetabelle_Print().gif differ
diff --git a/Dokumentation/Wichtisgte_Klassen/class_Cell.gif b/Dokumentation/Wichtisgte_Klassen/class_Cell.gif
new file mode 100644
index 0000000..70b5b9b
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/class_Cell.gif differ
diff --git a/Dokumentation/Wichtisgte_Klassen/class_CellCollec.gif b/Dokumentation/Wichtisgte_Klassen/class_CellCollec.gif
new file mode 100644
index 0000000..37252ae
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/class_CellCollec.gif differ
diff --git a/Dokumentation/Wichtisgte_Klassen/class_PI.gif b/Dokumentation/Wichtisgte_Klassen/class_PI.gif
new file mode 100644
index 0000000..651367e
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/class_PI.gif differ
diff --git a/Dokumentation/Wichtisgte_Klassen/class_PICollection.gif b/Dokumentation/Wichtisgte_Klassen/class_PICollection.gif
new file mode 100644
index 0000000..e0615e6
Binary files /dev/null and b/Dokumentation/Wichtisgte_Klassen/class_PICollection.gif differ
diff --git a/GDE_3_2008/GDE_3.vcxproj b/GDE_3_2008/GDE_3.vcxproj
index 2686cf3..1a38026 100644
--- a/GDE_3_2008/GDE_3.vcxproj
+++ b/GDE_3_2008/GDE_3.vcxproj
@@ -28,7 +28,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Hazard/Hazard/PrimImplikant.cpp b/Hazard/Hazard/PrimImplikant.cpp
index a16ef98..186af40 100644
--- a/Hazard/Hazard/PrimImplikant.cpp
+++ b/Hazard/Hazard/PrimImplikant.cpp
@@ -69,11 +69,9 @@ void PrimImplikant::makeLocations()
 	this->_locations = new vector<KV_PiEleLoc*>();
 	this->_locations->resize(this->elements.size());
 	for (uint i = 0; i < this->elements.size(); i++)
-<<<<<<< HEAD
-		this->_locations->at(i) = new KV_PiEleLoc(this->elements[i]); // zu fragen
-=======
-		this->_locations->at(i) = new KV_PiEleLoc(this->elements[i]);
->>>>>>> Added Comments
+
+		this->_locations->at(i) = new KV_PiEleLoc(this->elements[i]); 
+
 }
 
 /// <summary>
diff --git a/Hazard_PAP.pdf b/Hazard_PAP.pdf
deleted file mode 100644
index 426d371..0000000
Binary files a/Hazard_PAP.pdf and /dev/null differ