diff --git a/CampusAppWP8/CampusAppWP8/Settings.StyleCop b/CampusAppWP8/CampusAppWP8/Settings.StyleCop
new file mode 100644
index 00000000..32ac78c5
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Settings.StyleCop
@@ -0,0 +1,27 @@
+
+
+
+ enum
+ Fiedler
+
+
+
+
+
+
+ io
+
+
+
+
+
+
+
+ False
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/packages.config.orig b/CampusAppWP8/CampusAppWP8/packages.config.orig
new file mode 100644
index 00000000..cbcc05b5
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/packages.config.orig
@@ -0,0 +1,9 @@
+
+
+
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> feature/#17
+
\ No newline at end of file