diff --git a/static/favicon.ico b/favicon.ico
similarity index 100%
rename from static/favicon.ico
rename to favicon.ico
diff --git a/static/settings2.png b/static/css/settings.png
similarity index 100%
rename from static/settings2.png
rename to static/css/settings.png
diff --git a/static/skip.png b/static/css/skip.png
similarity index 100%
rename from static/skip.png
rename to static/css/skip.png
diff --git a/static/style.css b/static/css/style.css
similarity index 100%
rename from static/style.css
rename to static/css/style.css
diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100755
index 21441bba..00000000
Binary files a/static/favicon.png and /dev/null differ
diff --git a/static/Logo.png b/static/images/logo.png
similarity index 100%
rename from static/Logo.png
rename to static/images/logo.png
diff --git a/templates/header.tpl b/templates/header.tpl
index cdf1087f..9e0afce6 100755
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,6 +1,13 @@
Zöff
+<<<<<<< HEAD
+=======
+
+
+
+
+>>>>>>> Moved some files around
\ No newline at end of file