From 0a8a5af446f9d6fe8bce730322ad948571157e8f Mon Sep 17 00:00:00 2001
From: OptimusCrime <thomasgautv@hotmail.com>
Date: Thu, 16 Oct 2014 19:09:50 +0200
Subject: [PATCH] Moved some files around

---
 static/favicon.ico => favicon.ico          | Bin
 static/{settings2.png => css/settings.png} | Bin
 static/{ => css}/skip.png                  | Bin
 static/{ => css}/style.css                 |   0
 static/favicon.png                         | Bin 1684 -> 0 bytes
 static/{Logo.png => images/logo.png}       | Bin
 templates/header.tpl                       |   7 +++++++
 7 files changed, 7 insertions(+)
 rename static/favicon.ico => favicon.ico (100%)
 rename static/{settings2.png => css/settings.png} (100%)
 rename static/{ => css}/skip.png (100%)
 rename static/{ => css}/style.css (100%)
 delete mode 100755 static/favicon.png
 rename static/{Logo.png => images/logo.png} (100%)

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 21441bba2807cc50da0855429ef425f589edcf30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1684
zcmV;F25b3=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000I9Nkl<ZcwW_;Yitx%6vqnz!NkPGglPO?
zS!j2=kJ^V|O)1byYeX<@Ev3dH#8}Y;Z6Ov#P%u6|00Lrs0`UXHM>IwSOcXW5DAWgu
z8u5b~6$3`Ws!<c)j{pC1W;%QK?(TGVUOmY#Y44nS=bW==?%X@~-ZDQVl}eon>Oe18
z3mySaffvC`;2H1)*Z{5rjo@slKK2C0j{^<hUT_Hf0gO@dH~1KA2bX~}r1|g)jJyEQ
z>0?0WR4ELDM?npcJBCDHPy##+_^V|Z-xY5%`eT<Hjmi3~Ybx!DS;jzYzR{GtNP8Xp
z2i^qDKr9GIV8Hp{N$@Yw8Ef>!=NPBT?=ptV*Be8Texo{7t<@uR{`>Mf)4Cr<Rv9&U
zbcNS||53m_`HU|IKLed%78|2oX@|%Upd~R=t4B6O+bvzPFwv;hQ}_$q4<?Iw-U@Cs
z1?&epW3t#%*`483TcSa$NA8JsX6Sa}(b4JU;3H5aW_lyI0bgaK>fmmyYO@^rV(RTi
zUFt%u9=SH&V(ES}^$ufZvR12?hhIRanCq^f;rZZKxshY|%-<dDFm_igHLi}&)#{j3
zgSD|MjXf31j3o$$PR9Z4k5&S)+yy~nU4YM;?uKDyJrEB{5Hzv?j5X&?ZUf>;5rWDy
zz;DvnScGGSUU6r1f{N#X<I>Pr=65hd+;S$UFdiI`1{}fO-7g#rkW{_|&L>w;?zdGg
z2#2jFG1~KsofW-WI|{%Nt9Y14pu`Eys9tvr07rS|JKSq_RV>lkQ2_P_t>UI$pg^9L
z3XZuXS!W!aw!$-xMg}tiaBJ)etsM?H3MPoV*@BDg^%*H$<v^%U)fh)2D=p_=nZ7(d
zVAAP2q)*(<7F^t`C<o3%l|7d8$1ps;G|yzpA?y$*ipwK{!YYt+S{nq5F_mVgX9i$(
zY=Ks<2ztcr5kcWLMJZ62`XAU*e}CzzZ|5Ko&ms6{A~-1*L&0`i>VNG{>f2#I7ZLZ<
z0cf>d44m%xZ0pMqaWVDntQPmv0pOQcos#c(ocea&GMy)UKkAfxCo}ce<o$$JB7cIj
z==?e0A1Mr!MM~-qdXxHg<}v^+N?{<>W0LcJWWaKMpLeNmXB7i*lTsK65Bit-c6KlT
zo0LM|2_W@NUS$AwD}}zo`Mo{$J?!;$e8K>{tQ7jnw#vnp^BxR%3UQnPcwH&<4Xzpb
zFyP6@a9{xlIQ30_WB>x00%xZF8oyKD<OBn-M=A82tAbB`lTR6dElQ!MF!kRHKJ`rw
zFaRr*LQmPMq`prBo?Pr=0DPMYtEunffF~D&3;@^rJ^vJ@roK;O{X)!R0LW*yLQi<W
zwoxJksZY4zdwR79e{lDePRSLx)8o5vr9K%-J5RwsTmsiAl?+q=-AKRX{J!Zogdz3G
zI&nW8fXUz|+eO!~?-5F;elqaXH;IY+rv(L%DGDXip`?BZOImI-1jKU@6x0IOmc^L*
z+!ts%zc)OoPnL<>BZ5NmhE1s??7jY1Nd4yUr2Yw@-&2SSb8L!5qxSkCN`2BV?q&-v
z633e$b<~DC^|>%QN!-;76r!M*?d@qcRW7oeXRjZk)F<uYW`2R<I;El`I^wg!IN&jP
z9*Bnp1d3cNJuDR+!PGyTG2jWsSl{GZFh$&RCa6#jPDuj=*{q~~2*&y*9P>AeTcZ<H
z<f;+Z&~y!3w1+$OZx(lo6EwhsPC2K`O#MUCZprxdIR@Aq^_I58#aeq5HUjaa1VJNx
zKpO;ZV=<lglcj}slXJ;`oVZZBps{N}*5kk<F**aira%Dh1MWF*3L51>rHqb|dj$Kc
zT74(S0W6MRt_NbV2ZF}Alayxxbp`|pM|llmrniC{O#nOr%AMFcWBi0O*d4(Clcu;S
zhs{B5t~>&o#GGIR29Vi++w1+>X3G;|-C(?!5xl?{!jCHavgF0*HFj{%fqB6F9^OrX
zfs?>O@HqG!6q_0Rc)?TVd<Boq)8sImoC|mYd;n|({3ZFwybay~{1Wv7co^`YQ#;^X
e#N%JOtn7b%-f*96)C=JN0000<MNUMnLSTZwI|R1?

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 @@
 <title>Zöff</title>
+<<<<<<< HEAD
 <meta name="author" content="Nicolas 'Nixo' Almagro Tonne &amp; Kasper 'KasperRT' Rynning-Tønnesen">
 <link rel="stylesheet" type="text/css" href="/static/style.css" title="Default" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="icon" type="image/png" href="/static/favicon.png"/>
+=======
+<meta name="author" content="Nicolas 'Nixo' Almagro Tonne &amp; Kasper 'KasperRT' Rynning-Tønnesen" />
+<link rel="stylesheet" type="text/css" href="static/css/style.css" title="Default" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="icon" type="image/png" href="favicon.png"/>
+>>>>>>> Moved some files around
 <link href='http://fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'>
\ No newline at end of file