From 75faf4ae8cd660e96d3c8c18cbe91bb3ad253e1f Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <s.vanderhoeven@student.tudelft.nl>
Date: Fri, 5 Apr 2019 13:11:17 +0200
Subject: [PATCH 1/2] ADD:added nodes and methods to display random hints to on
 the GUI

ADD::added refresh button to get a new hint

EDIT::edited hints to work with the GUI
---
 .../src/main/java/greenify/client/Hints.java  |  61 ++++++++++--------
 .../controller/DashBoardController.java       |  24 +++++++
 .../src/main/resources/fxml/dashboard.fxml    |  19 ++++++
 .../src/main/resources/icons/refresh.png      | Bin 0 -> 12383 bytes
 .../src/main/resources/icons/refresh2.png     | Bin 0 -> 1549 bytes
 5 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 src/Client/src/main/resources/icons/refresh.png
 create mode 100644 src/Client/src/main/resources/icons/refresh2.png

diff --git a/src/Client/src/main/java/greenify/client/Hints.java b/src/Client/src/main/java/greenify/client/Hints.java
index 95f010d..0c3956b 100644
--- a/src/Client/src/main/java/greenify/client/Hints.java
+++ b/src/Client/src/main/java/greenify/client/Hints.java
@@ -15,44 +15,51 @@ public class Hints {
      * This method adds all the Strings to the arraylist.
      */
     private void initHints() {
-        hints.add("Buying local produce will not only decrease your carbon "
+        this.hints.add("Buying local produce will not only decrease your carbon "
                 + "footprint, but also help your local economy: A win-win!");
-        hints.add("Did you know that a gas oven only uses 6% of its energy "
+        this.hints.add("Did you know that a gas oven only uses 6% of its energy "
                 + "to cook? And an electric oven is not much better at 12%.");
-        hints.add("70% of the deforestation of the Amazon is to provide land for cattle ranches.");
-        hints.add("Research shows that reducing meat consumption can increase"
+        this.hints.add("70% of the deforestation of the Amazon is to provide land for cattle ranches.");
+        this.hints.add("Research shows that reducing meat consumption can increase"
                 + " your life span by 3.6 years");
-        hints.add("Vegetarians have a lower risk of getting heart disease, high blood pressure, "
+        this.hints.add("Vegetarians have a lower risk of getting heart disease, high blood pressure, "
                 + "diabetes and cancer than meat eaters.");
-        hints.add("Did you know? The carbon footprint of a vegetarian diet is about half "
+        this.hints.add("Did you know? The carbon footprint of a vegetarian diet is about half "
                 + "that of a meat-lover’s diet!");
-        hints.add("Cycling is good for the environment AND for your body, "
+        this.hints.add("Cycling is good for the environment AND for your body, "
                 + "so why not grab your bike instead of your car?");
-        hints.add("If we could capture all of the sun’s energy shining on the Earth for just one "
+        this.hints.add("If we could capture all of the sun’s energy shining on the Earth for just one "
                 + "hour, we could power the entire world for one year!");
-        hints.add("27,000 trees are cut down each day so we can have toilet paper.");
-        hints.add("A glass bottle made in our time will take more than 4,000 years to decompose.");
-        hints.add("Don't forget to turn off the lights and heating in rooms"
+        this.hints.add("27,000 trees are cut down each day so we can have toilet paper.");
+        this.hints.add("A glass bottle made in our time will take more than 4,000 years to decompose.");
+        this.hints.add("Don't forget to turn off the lights and heating in rooms"
                 + " you're not using at the moment!");
-        hints.add("Did you know that about 4.5% of the Dutch population does not eat meat");
-        hints.add("Reuse your bags when you go grocery shopping. You will save plastic bags.");
-        hints.add("An estimated 250 million trees can be save each year "
-                + "if every published newspaper is recycled.");
-        hints.add("About 88,000 jobs were created in 2015 through the wind power sector.");
-        hints.add("You can use LED lights in your home to safe energy!");
-        hints.add("If you isolate your home well, it will be warmer "
+        this.hints.add("Did you know that about 4.5% of the Dutch population does not eat meat?");
+        this.hints.add("Reuse your bags when you go grocery shopping. You will save plastic bags!");
+        this.hints.add("An estimated 250 million trees can be saved each year "
+                + "if every published newspaper would be recycled.");
+        this.hints.add("About 88,000 jobs were created in 2015 through the wind power sector.");
+        this.hints.add("You can use LED lights in your home to save energy!");
+        this.hints.add("If you isolate your home well, it will be warmer, "
                 + "and you'll save energy as well!");
-        hints.add("Do you have leftovers? Donate them to food kitchens. This way you won't waste "
-                + "food and help people at the same time.");
-        hints.add("A lot of coffee places give you a discount if you bring your own cup. "
+        this.hints.add("Do you have leftovers? Donate them to food kitchens."
+                + " This way you won't waste"
+                + " food, and you'll help people at the same time!");
+        this.hints.add("A lot of coffee places give you a discount if you bring your own cup. "
                 + "Get rid of those disposable cups!");
-        hints.add("When shopping, look for products with minimal to no packaging, "
+        this.hints.add("When shopping, look for products with minimal to no packaging, "
                 + "or at least packaging made from recycled items. ");
-        hints.add("If you order food, you can ask the restaurant to not include "
+        this.hints.add("If you order food, you can ask the restaurant to not include "
                 + "utensils and napkins, it saves plastic and paper.");
-        hints.add("It takes about 66 days to form a new habit, keep going!");
-        hints.add("Get yourself a nice reusable water bottle! It's cheaper and better for "
+        this.hints.add("It takes about 66 days to form a new habit, keep going!");
+        this.hints.add("Get yourself a nice reusable water bottle! It's cheaper and better for "
                + "the environment to refill than to buy a new one every time it's empty.");
+        this.hints.add("Recycle glass bottles!"
+                + " A glass bottle made in our time will take more than 4,000 years"
+                + " to decompose.");
+        this.hints.add("Only 1% of our planet’s water supply can be used."
+                + " 97% is ocean water and 2% is frozen solid in the Arctic, for now.");
+        this.hints.add("Plastic bad");
     }
 
     /**
@@ -61,8 +68,8 @@ public class Hints {
      */
     public String randomHint() {
         Random rand = new Random();
-        int index = rand.nextInt(hints.size());
-        return hints.get(index);
+        int index = rand.nextInt(this.hints.size());
+        return this.hints.get(index);
     }
 
 }
diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
index 1a241f6..e76c408 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -3,6 +3,7 @@ package greenify.client.controller;
 import com.sun.javafx.scene.control.skin.ButtonSkin;
 import greenify.client.Application;
 import greenify.client.Friend;
+import greenify.client.Hints;
 import greenify.client.rest.UserService;
 import javafx.animation.FadeTransition;
 import javafx.animation.PathTransition;
@@ -46,6 +47,8 @@ public class DashBoardController {
     @Autowired
     UserService userService;
 
+    Hints hints = new Hints();
+
     private FadeTransition fadeTrans;       //transition for switching between the different panels
 
     @FXML
@@ -168,12 +171,18 @@ public class DashBoardController {
     private CheckBox bike;
     @FXML
     private CheckBox solarPanels;
+    @FXML
+    private Label hintText;
+    @FXML
+    private Button refreshHintsButton;
 
     /**
      * Loads the the necessary things before anything else.
      * @throws InterruptedException exception if interrupted
      */
     public void initialize() throws InterruptedException {
+        hintText.setWrapText(true);
+        hintText.setText(hints.randomHint());
         //set the dashboardPane to visible
         dashboardPane.setVisible(true);
         userPane.setVisible(false);
@@ -225,6 +234,8 @@ public class DashBoardController {
         addFriendButton.setSkin(new ClickButtonSkin(addFriendButton));
         addExtraActivityButton.setSkin(new ClickButtonSkin(addExtraActivityButton));
         addExtraActivityButton2.setSkin(new ClickButtonSkin(addExtraActivityButton2));
+
+        addRandomHints();
     }
 
     /**
@@ -415,6 +426,19 @@ public class DashBoardController {
         calcStage.show();
     }
 
+    public void addRandomHints() {
+        FadeTransition fadeOut = new FadeTransition(Duration.millis(400), hintText);
+        fadeOut.setFromValue(1.0);
+        fadeOut.setToValue(0.0);
+        fadeOut.play();
+        hintText.setWrapText(true);
+        hintText.setText(hints.randomHint());
+        FadeTransition fadeIn = new FadeTransition(Duration.millis(400), hintText);
+        fadeIn.setFromValue(0.0);
+        fadeIn.setToValue(1.0);
+        fadeIn.play();
+    }
+
     /**
      * Opens extra activities.
      * @param event the event (clicking the button)
diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index f4391e7..a91f6d3 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -48,6 +48,25 @@
             <Line endX="104.0" layoutX="105.0" layoutY="178.0" scaleY="0.7" startX="-100.0" stroke="#e3ffe8" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" />
             <Line endX="104.0" layoutX="109.0" layoutY="223.0" startX="-100.0" stroke="#e3ffe8" strokeWidth="0.7" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" />
             <Line fx:id="pathLine" endX="100.0" endY="28.0" fill="#1b9736" layoutX="8.0" layoutY="323.0" startX="-100.0" startY="28.0" stroke="#5a635c" />
+            <Label fx:id="hintText" alignment="TOP_LEFT" layoutX="14.0" layoutY="420.0" prefHeight="218.0" prefWidth="187.0" text="Hints" textFill="#c2cdc4">
+               <font>
+                  <Font size="15.0" />
+               </font>
+            </Label>
+            <Text fill="#002c0c" layoutX="14.0" layoutY="415.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Random hint!">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Text>
+            <Button fx:id="refreshHintsButton" layoutX="157.0" layoutY="390.0" mnemonicParsing="false" onAction="#addRandomHints" style="-fx-background-color: transparent;">
+               <graphic>
+                  <ImageView fitHeight="26.0" fitWidth="24.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../icons/refresh2.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
          </children></AnchorPane>
       <AnchorPane fx:id="activitiesPane" layoutX="214.0" prefHeight="703.0" prefWidth="820.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="214.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
diff --git a/src/Client/src/main/resources/icons/refresh.png b/src/Client/src/main/resources/icons/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..50d897f36218d1b2996b6ebbbc060c57bda47e07
GIT binary patch
literal 12383
zcmV-lFrd$gP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$001K4dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3;uavV8uh5zFeJ_7dTI9MZm10UbtLlvpkHug9?
z8i{1Hy9z*Nz9oS&`@jD4nE&9v8e=svm6}`5mj7al&3C@3_WAGm>TJCK-v843D}Mgz
zb@TlT&r5-?;rTJ|_x+vM(~l37_`W`Ve%+M$UZ=hndVleC!Js>PzIoqQ-wOr*yzbtg
zO?yAr<HvN~zjNP9SodD^*PmlyF;?Qm;Emsb*ZH^VE`bq*7CK+!{Wp2N;`u&?z`r5n
zKd+tn{`Qx}`~L2iwX^+wJ^Z{B#^(18`Ij|%Uw7%xYj;=Zb42dPoqzhp?(W#n|3234
zoK?@+&+K~4tW-Adq`szdzvGRAr409DnLmZUiSNt()A&=F;v`~=Xb%2N<C^oV_HofI
z$0*#sU#FW4G5YNbU%j6`+}CO-zWI5B67|O&UkJ}Kp%Rlx)B-R2@3FXh-*)deUFFWp
z@lNl!n4<XGAM>Xd|1W>OFLaJl*Ew6i*NSm@B_P94<n%A^A|P)VR3h%{kNL<O`w`ec
z1k+vS$^^R|&m~53KXNPFI0xRBY&7;M4OiBC0hWk+CkEpJ5wO{X<g&BH`{EqyScy+(
z<UT|{h=5DUFJ}(1A@2!J^}08oDek`4C;z+*v=E3Cawvp`0wP#3Ci17mN)GiDQZy;0
zoJy*xrJh5MIpv&77Dn|FN-U}5Qc5kY^crfcspeX0t*!RvTL8jR%dMDJTWh^@)6S(k
zpYFV)_u)qvaioz)8FjSLC+RceOf%0i>uj?xzrv#YS6;=ey4vd7ZBl8+op#=3*WGqM
z<k|@*o^<jlr=E8Dchugf{v0*;OXU7JYVM7iA{Oua%8#h=aw%VzaDtPhm=Q4_9T6{z
z0153CGh1DZUXfGGZ1WUF@<h!g1!p-$j0nc<d^+wsc0VHbk8v|8{;Rn8zeUa{bpIcb
zGYZ`sx!>dVhp4T78715RsS35GHXMMBH|*Md?c${W@#`MrY)9&FQ9c_E3#ac)Sw!}T
zV$yQEm2LAPJS%h`SL};A8N;;`e5^Y)>l>p6<mz7hpCF^@R%*eF)YoQF<8djnOs9-C
z?QV-4T@(?^liQvwz+?r|B(x{ERCrUUJJyr<A)F2PlfqVGTFg{msp_JyGbI*%v&1R2
z-9&XR1IjJA5nAzs^(Px_2(yK4svmLt!7WNl#BKLH2s~AA;-0<FJ`aoRL(7S)rn6S+
z<q(om7wPU@+8)3&Vmt=0W3G2RwRZ;k&*L1aE#D!OeR#38yV#Ka*^?YOW4Xh9xXG|3
z%(21<y&bY+raoi#u8&^zp>#@P7JOR~MYRxhfK5T96u9s9dS3<iX1pPdcT8tiZgC@<
z5&<}?k?^PRk;$}c@|E$K;y(vymDa5gsgwdsGb;E(^|rKT(a#eC{Nv5c$KA+bt#PJ0
z;-VZ*S$S+qbFyZELh1`)(`K>pbVs7tmY0^gWj_o<qeiJP#keo)r+DDB!HR%1#JHaT
z&<9ZdMzn6-E&1K4`h6n`yi{`|y1ye@7U86Ld#P?jRwMF;zyOK88za=?H$syXuVgoa
z4r_$fM>EXK?xEyVi9U7nQ8v8S765BAOXj1BfPI=DYtQ0cO#F`;Sl&F}OAG$XuiQKC
z<@Zq;)l6nj(l`($q(=g9(?)0J0)noXSdlum3xjmZvu#!}15c5F#~>jys2pUd+h*DW
ziXEb8=c$>|JHMJ|9i$?GXJiz`u~w~Uq`^IqK*Z!^)xP5stV}rG#1c}O(G!qJbjyfI
z1u;+No&Dk>=!k~0y}4K`WH3RFUCY=2Oj+CzX&X$5r-Gm>jxmeN+uK=V-aFOCO?fZG
z&ZK%iZEnV8H>@95uFRV&L-!+qshiBsBwA}M1O?0WQX>-vF>z1}ILNmN>WCXgus++_
z$C}mqzB(}lXeqEZt2xC}Grms}2;k&zCcv4&mK@J;3p4~TS@JEu&^&;$T|!=iyz0q|
z{B3%|Uw@!-i?AMK;+YNg-;s)~k3e`<on#P2Ns%lo80Z~DYZJ(d(NHNADU6z^6K++}
zscQhcy4502wjjlVesMFv3E3U)qoOKvz?eQqp}Cnk@;}Al?HQ*KlSrbYp%WRlD3j^{
z4TnIE)~Pl`Lql}CY$+2oUR<v@6Kmk6lXz_TlhKFEe0EL?!8$n<%n5^l&|8xP$S@1j
zO;pUteJZYbg4s-C+Y9og2tMXl`6o~I-STHZ?UsMo<X>BbqOYyYkjO<6{`km<X69!C
zPfiRUh9DgNuP{=8dB~g%m<e9{v26jWM6@9XNUsrQKHl<PDBsjJ8$eZTxSG6?@pT-J
zieS}A_&NYb(nDc|@it=VM%e!H)qK1FPm*98MYFQ4RL7#s7$m$?!3=_rzL^tQRB;m!
z{V5DNmKyn-0c~nanR2i(o{U8Rd?(2YY!@y=zPhTc9boW@i`<Hv>xs<go(mgkXSNMh
z>j`*3O%)|B3WeJU>|k<L$P6F|;Xs5H7lb6SP&=eCxan<51fsBzCS_`JfpvDr0l*{C
zL5>_Ge9#5xA*decuSCs~Afy6`g}o&uGu%gF!a?qsIVVAN$wS(Ezu3vFb4~XL;`P7!
zYQA4^B8Itg=Bq`>JieM$hGsj2gBB!+kuY@DsE;(4^6p?dpsHXdXt>H4C?g;a(j?=M
zQ2~VptANaeo~5!2YV^nPI>;BPu<fTRhWz!&R1k9bS*b!QgWN>Yl`{qiu~^Zx0ZDRx
z0py@1`VisQyhcmdT&?gWYmdn<-H87%ps3bNDjo#RUIV=fC&Y#xsyo=tI(C8?8T8)v
zK=QmRbAczeDi?Eun_JB@f@`CBfIB^!64oE_HyJsod0#p)1+vjklDt5Up~!j^Mr7O~
z*_e}C(;Y+~LN_t3K)H7?P4mVi55LiZvb$sA7o-5;;@wTy$N@Vi;uErgg{b7VqV1?p
zmM??Ysj_|*Z#+x1TEA4F$Qc4UgF;6ppmL4$CJVsFBRCzZQkCDs(C7*>lqv+;i?T73
z!K@v8mZ`Red6^BA!7uJs4GEEU%6NB}3ba8tqTaxXT{>5+Npac*ZoB!GsOi=Jz~d%?
zY#?(P$KfP;P{E!6kb$4e52iK{oP~KK0g)bK<`h9<0F4;p3m|d+wFaeA@<5vk*^!ZH
zk#3aAz~1fQ*NO+8M~6BFSZV^qCtOrfto;7U*TupdlS@hnnmx97gRAWVgAm?!EIQfM
z?LqmoNE2NQmW75`{)?LA7J`}uzw%h(kEEp-!1L44<r<vT;9}a+i#vvV$e)2bo4&%c
zdjXbZw-e#CA$4O4b7(j<z@6K8=gYG==)jEDi~bbCNv6hrQ*vS}e_3kaWDJ9|Ah)>b
zP(LUHvLD$q<AQ}0W@OSHkWn8B>Ijs-@;g!i<lMo#sp3O60AOW75nAqyYn@;LDmx|a
z#CkC_ivlMMkUbv<xN(Ajm&}w?%g93>JDQ=Iq<XnKOT0^MV+ME?+9T0fECTe!SAFwV
zG87>e<c)|SD~GIw0u0ur4SZQtg|wy0tE802^HO<MB1;rLWD7zE*||D79y9XUb9Gg0
z7ebP(lM49)R<{@wfkP+)L%DBw6lSVkW++AH22tjUb>dno^a8UCyl*nB_3#88g?DuX
zVl&H+%c4<@fP||!b0-Y-b_5xACzh5R*p2*Fm&*==pem{e#=pn|u2Um;Gvxir-n;zF
zF7l0}opMM0ftw1a;;{Y0u;%65fmY7}_(uwhvxtpNYpLoiuan!@co84U!VzOs7(Pjj
zUseGyMf!nHj21J1fhJ49rjDbrt?w}5?A9V+2c|-Ng+P%UNHQ5zDj2uhm}N$HnC+oN
zU^Y(zxd1sXbt-k>mv4C!`b-*8WYwu9NeBccYa^nb#10=*BV%fDQm(wl(hX$KM%N=-
zR!F@zcz}?>&&(Z_50#F($$qkd+cV2m4b~HRmhjDh@3CR-fb2v}k)lOPQ8QqshpPey
zNDV*|BA)ybwr~y%o*U&~5#^BG5;ah~E(O`>u_SD{c!vbJ>l{=}A!>|zPR4i0sXH}q
zzo!<oFkA?s-hxjd%aBQ6OkTu)LOhWXt*&NC8?|kjnnvcM?^Z3{Dme{$f$XGcCO(7d
zA>9h=h0_(gQ|~u7DS}FF0#1})54Buv3K_9r0*JUwS(qPuL-uIIjSd5-(5pnMDCM#0
zd>**PJ*_YOcaY8xQq+<#i~(i9VzaPA);+g0tGXCRE>yO2sN~2c@1}%g6{V9AXgbEh
zd>q~bO-EYwY1CZqf~~mlEtBa)GI&6>gQe|cPS#!l?<U8^c()$`93)Abij?RJ>s!r)
zMQ_W3D#6iU&yc=pxVU;LAO_<e$n;+J%Vwx?2=@ytij1=lEH<`!0>2(ITk4@#X=Shh
zCwbJX44ce~ry-#2tpTSd(Nfz?q#cN9FRY$Hfh{$erb{hVGLqb1BwFAaz;UZmkq{f|
zY$VnpNuxcaOPzFwB?IOiViYH|R&jn$C;zm(3Sc4dS%<KZ)`KBJFOdvI^;6SaEeewc
z9y1Ui^$Dg~<cb_CB^q32@WM@p9IktTH&^`S=^K7PEejL@aJ=FqKc-fds07x?nYBYf
zgAM_85}!E>dIwyzXTWFXfkR_GNVm`jR)Al?EelIU5gZiy=<=wT;{g>R!?pAk8OLhs
zUYUETYlk=Q+-f@|Bg_HRa2cG@y;i?%%YbMz6aBU}3x_s>*l_P?+<L`ME(pgFio9Z#
z`~<rp#a^$wM7q9>L|o_ghQ$<ic_6;ub_5EZFW?CZK#me&M^&mZP)|gJ6AG;r_lNRG
zc$5p1#EODqf<Q2zP@}<7-!K&GPj!P?m=R3=ad^B9hhna+S{V`bmu<uzb2rpYH!A^b
zpjIo|Vi}TF5-UUvH-!0bb;A0MvXsg%9l_=>f!%Gw+8a)ZNFgYV)&nmN8=MKxFEysF
z1a$Z>LY?@V8Nk}4e_D(U3daOfIY=}JL1o0vjZaSn1u35|DecMCN;<G!)Jj)x9jU%<
zI}x?aj379?34EOp^bS*sV7K5%Y9M)%w1sgqYDJ<qAss2!3S^WSH4F(ZwdT;(S{Emy
zaXVl;n1<Ry>!Vtr9$#t^Kzjb;k}5s8EU0#X`Nt_^=*e>Y2#|o?=KcX{rbHq@0~%4`
z#0P{Rf0fM`BsDbgvS=ArT)@DMFz*uj1Rsfj5n>G$zhF(c6rI&+kn)bW(aP8*dX7!E
zsaheV+k1oM&WVy)<F1@~b{!oFwlAYrK5G>Olc@v5+}h*$fuI&iZN`c8LXs_ig8~RW
zeVVb}KF!mnF+k(qSZb<jZ#-<k6rk`R9vcu@3*nsNZPMC`x@65(LH$HX*beQ;qGc#O
zJS_{v;sgp1+g@+WsAH6(;@`_11>PBLl3ArHzTwT5ixj@|RVGj!0|+uj0P3iB0`6mm
z)GolWFn-%q$K13%x&|~}2z*x%ibwW#Qtl3;iw2TlCllT6%Q<yP8?jU_Q4ulbydEnf
z2m05JBoz}3`G&+`Mh)>v94zXZKWGIK<>s=}?%HyTl8|pElY*_;tM^Xc<799|Wg8(j
zKJg|{Spp>2Eu3ZRcF?>SLpvDE610G7z(M<@Kc*x~pP*wIuMz15?ftQ+C@@wifdIAc
z6sU;JM-jnlM&il`QRpmci&Cw(^1#k`TLK1?*swwv9oSs%k>8<P93$seGH2SbVAX0>
zwxPvA`aC5iAaxr_C`fvsMox!3N1c-u0YoyQg;Jy<xyZB7ygzC4>Gxh>5TU@MXbGdN
zfZGNdf?92b@1{Jrlj>G!sxvMQpst49NbtS1)iQ8^T90u(clCy<?DlA%1V7ATBO@Id
z4-og92WAmMdbTrAFi4kis}8Uj{1|Gbz#_2OO@FtO)XYcIx1f&5)=mN<%JM6q8^L(M
zRcRl<^Ke6tv1B4g#Q|9$3Jrp5XnSSD8HcdxqNqKoNJP>VQ>R@xD|f#kh$fagy3_%Z
zY*k7cLt&iL{sbRh5_(sX-EPQ7>kUosn?sXaN1GA?OS^4-W5$*%+Ppj4V1h@IWfp{j
z!`Mne(e`k`nRovX<@ww}1RKaZr*?1wXfUfRMM4Ry$-?-xd!S8}c<O|mnF?M7U$~_2
zaoRF8+LO7hAiRlo7*jj);5fgc(Hm}5=kHs4L)|7kDHkWJ5mabiREr8stqHru*H{<S
zaUcLGn2wul=tON(0C-qD1~S1FO!eN<v(yQH5l*2lOAXwHA!`*H3X2p5`Z0orMN0$M
zOon;90itHwrwrdJOuts)GwK|^!Vy}8(aot?k>05cNEts-Ysa^MBRCTTEQEo(M4fwt
z9?mZ%9Kay*1-?}q97BXkMQF98{SQ`gQxf(_ydcumIl}*lrnO~o6_scxLsGVsgLy(;
z;tk+9^Z_M#&mR#89G13;m7MbVst#$sAzhCod28cV#>VvYYpTe5cn-Sh#~G|^|6;Fl
zG3L?T@D~J+Ny3nm#o}u1iUB3aTgRMkRtJRXQ;7!6p~E8aEyZ<j_z)xJs&Gq869B*m
zFk0t}EiYGE`>-WqEW)&`5A)Ifqt}*;?jPU#N$gGp9}^~-QhvSl3;+t&4V<w8?ugnj
zORa~wW3`mR_o~7-@IF3PIVo|HwjlZ-cq1q|RklDW;K%IYEp@aqk`63ntnkQ=q9Cu%
z`YY*3fT?{aY+;dx5Ds!-2>vO*fPL1t=BwFWvAhd{utZJm7a=R2m%l^D0TzS8ovB!h
zT8!v=3D&L-IOURxk-^WyUO5PEAqTxq<3Q1*Ho*SPZDe-wxAYL!L#1bBC;C%*#mJZ=
z4$}5`NOyZ?iByCEFu-r~O2;LB>tZ9YHoRW&p9fEBD&y)pN3}`1?j*sn)Qo?-P%+9)
zTR?L3oeVnH_boMXCRL6~@y8=8<si{p&s|w_#60M$U<>Ya)qOoGRs_*FHpzr|(>8WJ
zE2Rs)1Q{R#{Hd?tE+C>o#!7Dk6o~q+ZcI$P;7XnrWC?-V0_2;v;)cVm&AM<e6Lsk!
zRqSQ_thn%2+z&Q-xJW(9L7Bptyq?X5fDtu_a<%MF(tgU{cm=JW(~%y+60C4{`gKqt
zX1@&MR&RStu>h!7W@PJ>B5utpd4*m9dgXqyj!J+W@<gGjx1|$Pq<q~5&_wCN-c`a-
zpZBFde5SPQUZRwR2ML_ctWkYekwzT{K#>MHXnXNUJBPoP;J>dx^XC%$_Z4V9O7IWm
zcBlwRp#o45{bU)`!zo*RN^y$S>YrqSj*(1{Yan$+P{^`9r4p|(j}JWo(}4JrJ8vcV
ztnCs)cC!rh=S`HzYtjVX;5oqGB^v@77k~4Sp?}?I&v^M}dO;1QBL~$E`a9cH9U;S_
zhyb-!h|<$m8p&btEKLek(wl78w$foGaFJYSTD1cNeJm$*3!&@ql+_s@9hV`Y5%oa=
zTzh;elGr#x)ep-tot0M1#%ZSs)r5FjrNX%c$_?#Xwdv+A#XYAtKy)a)H&l#FOIFjh
zB9HHG)@a9Q8v$8;WPwtYBiZ;;2Rpph^sA+=R?<DbF}!0LJO+u&LwTqQO39E^q5P=i
zu1fwaWQZ6Hi&Z@?i{4SAHv%@=#BmP2I{-*Kvk~7j=PK6<++P0(^%T%bsv>!Eru(Q<
zYw|2QIC3Jl8#-U*<klG-9>SdI)Wi!&IHtaIKnJJa?^zV`s%5MS5_I*<w6w!REw3%p
zTHQddsI_rwE#~f(B?_;Ui=~=i#X>@fE8XJ7?sgou197vOanvZ#s)lA)GmdyN&t&Et
z7PfU$XGWq+fSFhOe&PD%a^+o{5AM_TA3P(u?a8dJWd|>s0pyV)avZyUbmM-s?z0YV
zQB;&tt6*1*0M3+g<my4)hN8}=ao2{Saxo1tSiG9;j|;mhk^JP+Q75==2P0+;yJ7>?
zh^P%@Mf{gAU=bV<0cMf$=Lio}6RW{Wv8YI>O6{sMauZ@Cp!Fu`x#EJzb<$wtwXVy4
zpiA2pD}u(XN_9Fh7`Y2G26$|tUbcY8Z^jhtK^-IOQ?JOE-7_$Pv9k%1nz!W*VgM*R
zYCqqh7Na&OP@wp0Of5<BG_zzrN#)jV_Yg&p%pmq8pv%A=ERDb0>WBp?DBwuDy(8un
zYDVkdjUKpwB6s2G!%5s8x3-CI&(CHi7<5`~fm8=H!4k};-G}Fh5Jb7{KDA3EUvJOP
z-mOj01rY%>1Fh%|p_>}ix|jNk#{#iX9=AfPyAFMfRKt6%a~neZr`v888zQFapvCm=
zY6Lh7R7LKqCz{nYYcbAQfvSk51rZDEHSkke`#AiKu2$m%S}~v*?#?mlUWmWJHe~oo
zP@E$$K>eGnnI8)!BTQWkl4@Q$C0PyJ8BrjND~g&?V5~J**ZDnls@8Cu_ZXbEv31@U
zrFK=?(g6XSbvXdVF)c$vr?K#Aq*b-RukSwE_$X={BfwI?rK4*=z_-QWZT)sq9Z4}v
zqlPH+Dyu!!a7zGjm)Xep4P>2q>u??U_0?NPGWSf$E@URAy@O+be;p0`6pk|GfLlT!
zmk|@LgLf?WXo+g^LLd+n+x;L=B-7UmK&)3XPF+s{k2YtH^x3(42#BEI^Csul={nL{
zQ`Mn9?R<ZnI-?HMXB*3irJR}{YNLpq8|o)H?RhY?S=~m+bZrU6$a;=vKhA1D4%Xfe
zM0FbtvLpD2U(=4yRs$AS1ISu6YMM$x5(^fm@MhDw9^R}&K<em$*mFZPX*<LFy3X#P
zg_-K{%zsbbvsm}~W#5r7A3?&!kQFd-oWL?wT-9U=cQ+|KyBEal5HH53!?@|$#^Q}?
z6Z!k(g-!`Q`*0AOj=AnF*B_wlM8dUjfS#>JKYCRMzjU707xafylZ`iYq#XS0Zl_xU
za$#DLQI>>5k}c!zwjQ!(%PWh{5i<z?1j8+hj(bG1`{`f{2wc6LjYSUXkrGLh?i93_
z7$#~*53Z1FQ(NPR&wF0WXPskM@+-(4_(f#H<+Ur>FwcA1Rm|P|YuW&P_Ws5I6AMa(
z<ka|YwbZGtVs(*=jG}Pa0VLEC3a+G<Q!)xT9KCh?TW3zx-bk7woQ#8SIxYAFEdJP+
zFJwZ*Yr%yQB~yo(lUx?*n<Q-c5EOC{KP2&*I%>$u!}k=A)lsi;k37}LXmgH8Af4WT
zqnTQhL%D~!w0j+njz{?93U8P?E9SVZcCghe$9_Aj1F>0+R`>2PW0@TzI#pX<7J9vu
z+_jspr#v3GKxs*lzB8IjJ^V&0$~9aE;CiY$4UQPK+K%^V&$}Jp@5vVDCm0P22$AZu
z;XjXRu!rY>nsu}3fLhu|ZFfBFJ#*7gZ6nvzyY>SLs(~~_GehkpGzkkI$(TfK5+V^x
z+!>#vOw2%tc7hFZjk>vKi>&&9#bZ$bI-LV;RVrqlsV$SZA@FUrU9u=NWMj~=Z*=!`
zXmJzn$XE-1+Zlmd_XUXp!&5z?V~4ivrjDS^_4iXT&yg7I3RpOW#MP;79qlEx)tStF
zl2BZvvtl^HdvXN!v-LSSf@Wpq;5ri|W|<2Dh|gfBbRvezw$f}~J4{O(W>+HXOpLUX
z<hJ^IPk%(ozmnR}4tpKG4ze_Cj5f}&$4E^CBaT`pV)}bAbrAVXMH1^2E~x`Y;&=_r
z9hm0lwW<!lkerC3I@AOlIU-56_5^jdQb*V!99Wk3B{_|my-7(20_~CP?pl_vEq1N5
zBgIR>w&^VM(*W^W$=_NDi6t5UTkU#`pax$djR-$u-_ORu9gmoW3;JllmyHf^Sy|nh
z0fGZbTiXtJmEzMh_BjWo_Ud~M%1y3K=8=J;+(u|9a!qPewe9)%bCy`GUILksllUj&
z0wp4}Ugw_CzfV*kez}q(cVWz`GhlUA0gc!nY$3%dJEt9Oq`bV2Bac)VogA{@7g7}V
z_pVj#qOzV=c3(&GrTMnDYwK<^Q2J3G=9?>>S-%;=BI)XwP+JbBWkqUmo|x!>G=7iO
zZj?U;6(pnt?cFXj_rxWrpaW_t4g`6jbb`0q-|RY8?9?F#+ir1$+ZoPbrsXrsrR`ci
z<dY%6aGF72x?%&=mHHItZG{8iMLqtYZBq(6rBiiEf9ix%R8#ZWZy;c1i6)|Uue^>m
z>Pastn|*CVcd)!lOTr6Tiw*-E2$QrlYo?C0d}loqsO_Zc(jze1A5`~89V6|AGXIhO
zw?{V3Kb_%ZrE#dK7S`O~W24X_wgqXa=kTDF8X*_Y3TDIDNY>?nD(^D<=hfDLLS&v3
z2;S8(_V>hQyqos-MV1G#>~56wkjT)ccyYKj>?zrURMfLOx`kTbX=m1X-Bie4r?zAg
z!ac8xAdr00=056Cr!-_hnw)FB#W1j(IyZiD2JVY`fgM}rn+_=_K?8N;KtHnQ=$V5e
zE#Z)URisA>sa-oTvJo@M$iq56&d2`c$l=FVqX%B~P=E)E7QCwZWg0_=yEcjGa8JYO
zV3d_!*1@a;8;~;uAq_n|pvH|gXes8o1tvN)_i&btdMKbjr%d%sm7Z2e{se6&--mvf
zHgYEVDjGu=d1E)MQWnDC9!-<1I?}3Bu13qF=Liltp2ogM$;U)c>Np!83xtot(cvL;
zt|h-GeAMY`z)}T9t&T7(nbL*dB*B~D2i;};)?;l%{z#^dOlqVQmx)7<9-OUHZV>b?
z7Nf#-)yX3sg>}qx6gw)}0#@CYxi-YIT8(F@`Q)?(?NY<IbzA|cFq6*eS0%N!vd~0<
zwV;&LTvG!@PZUsli8w7CW*yHH1t|s70v1=hkWtSA=uxTX_|#V0p11ydfa-02C#(J;
z@@VNuUQ|vR+<8JSa`ynkdVrzZd-q79Mn*X02(CFrm?EC53@(bbg~&fl@`k*d;tINJ
z4DgwISFL?eGXdc$G5`arIuLp+BRX;^-_lx1()?~;YAXlIGZgm(tO5VoWQ=9j(U*F7
zvFo7`m5lp(XhhGEXb(pZjp)fUbd37Qh|FzJFbFsgBB`Ov@?+aDN~p;-vY-&~fK0*F
zd$zGu01y3ldj(q(HEK874wLOYZoCw7btH8*^Qjj-MB~*x_wPeAPR}+%wt9#Lix5x8
zBd(=`EMuC50duVOYO?s?4KAMoMN@+)TONpf^Ht~Zm@p}e+!?)U(~y_iSC?{|ALp(9
z?N_(dFGW~_I)@9X9e~!USGH`@uLoEZ%h|I$cGL`#o(?Ji(atOb`G#oLfaNr<-7Z%j
z=`;_b1R=T4^SGaFV6k|^>70a)n`Ds$mAeSCwi)!SiB+KuZNklL&Eqx6U3^)Djno;?
z(`~5t?fsI(9a#@ls<r65*CA~QDODhDlXS2;JvxkLgjj!`i_^n;&F1@1Tpk_lVxroz
zVZgV?roN<}XS#<T)M~hRrAPIQ&Uk}(P8@;q0*gnI{gL2n?%D3q<{Aclm9K~2^!VSb
z;eGN=PybDGE#Lh>w;EM+??Z!P+hV8AtPgEiXiEK(w;x^}7>KzK>OsHd6vI5!`XJ%1
z&K{SCb9{!Q!Q8#T@8QJfS;S{JWZ5$uMq}=9J_f@t8H}D(w-Gz2ZEo%L1dRn-KX<y%
zAr_r4FYyFBb<pla!>{xlRTx3|f_B9j<~Kam>DfvM(<#Z_-FA4or9a1qAFX-L@eri0
zhmxL%>u^;f;+u#E7?$M`>Zb(b$tEFqC^PNHRM>9st>^pi1DtxAn2?r$$2{@KouKYh
zRM+L6G9vN#2FM2)u%A1@*%vnpq>J-MA5pGqU1+#NI^zyh9DL4rnwLi!7i8=c5SblI
z!e_AZ8;au|AS@cmn)e)N{OfZ--(U62=xXM_0b(uAXUJV>qW}N^24YJ`L;(K){{a7>
zy{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2jc_<3M(Ypz6lTj01W?0L_t(|
z+U=Zsa8q>_$G_($Z9<Z!51<BUr4K0u7HmO<HX^G~9)i2Bu&%(&?uzb+J3eODQD9kc
z5O)hY>NxJMx-&j!0C#!JI3TYo=$5oa9tBb4)uxsLrC{5nX=u{sp8eydfkK+cy*IQ}
z&Y!vM@BZ@1`JLDA{C>bqxhXv<)RQlt_2PbX7`$K~0D%BzFaRQeK>#=~O#*}2KVg!d
z5dm6vJhrU3<EH~~`l<>rGZ+#LQaA+$OJgt~GEnlDg1!fET5);MHxUTF!S7E=F`7z}
zjRu$u2IMr`LXLGRu@KHnm(bMeMq{fhTXS|nH3u~HGEj|1#MbAnH#Wd&tINP5x@ekS
z7mtL@PuP-@92Qojaw5r!`o<=-*dL)bk2e4k3<zLsUt+zn08TBg073NIDnKI$Fl4Ud
zVS@%Cv+;j1)rgbH6Jf8fM{D(55?S=CC4*uFQdNMH-q;O&n;uNkGSX@^7&v?b7vj4f
zG4Q243O}BhO+KF}IUoYsbZz+RPxtmdfJLh+AV6BLM1+C4n|LDi47jVs#v^h5*lY?o
zFDC3<QqVg9KJnHZp~m%`7#Jz-qgAubrx*3Mc+G9d!j^OGt2JkSx7cqakzsmGc=zcI
zVvhkVdbI-NlOi^O1Z3ua#(8ZAdUfDisT+%$Lo-Qa2AHAIvLbIS8{qU;${~u9tuyL%
zC>*nv&93ini0r`|e+zaUdx~1yJYX;cfw29Bg6jux`sy;UNB{wv^pE#Hm{2?JMoh!j
zJ8xYt)cy8hu#^eySTrH_0H+m~2fVB?b1hHrSA9e0vfD3Zq18T*7z}1cNtB^ZQ~+lb
zmqC=0Q6vpp&y(Yh_lbhQuJ#->oqU)8hQPqKC4~|HuMoM-+XEjF0D>W7ZJ&V$0Qbe6
zfG%SV0|cKxUso026K~BCM4tu(AU^%${WA>J=xZ{|V239C<NZVghKOIk_^o;X?X7<n
zi2$QshX-y@hY^W9m{2>;pw|H)IQzAzV*{ramxBl(B22k+L(D>z)chx5F$_e1T_Q}n
zM3}TX2#5y&i15PI;epHJz>gjW>RTJoaOj<w%%jnqhcEX&KrD)2fw6OuRX)H;Z|sKN
zBmE-TW4EauBoD}2h!M%z$TAH<e1|!@SWfFiwd)MNZ>qvYm0|9W&&LmkW)g!TToSN-
zMfc&2Hq<~mKRl#;v?{Odv}zL^Joahir;f&88Z3R#5&anP9cJX}&Bz@z0_QCGIM{Fm
zXAk~EmHFM_twha`3sdOK?>`syqC5?pT3iA6qx6SHtYkGNCYZ7@dBQWuh|7-2@~djE
z#;(twQEj|UN0*Vv4A%Hi^1|KGIT3;gB4A+dCRO02je8bz?|ms|@Bkn?E(`M?Sc9~2
z&#Gf$ayK#&Kt3TlFFdul0wAfLr$$L?jCDC?q!z)@kr;DNYUoJBjMO5Gu`X9U);+>e
zXfy%{K+!9EqR~KU-KXSiP^^7--t#iXoA0{rA<202T}aLUqvCP;=WJvULFh&cg<vHr
zkW_|Os(oXu%aLcy>yenQ!cl>S%6};yXCi$EfdnuC_rGcj?}Y^)OX*tXIz`%-HtyM|
zHLs5AQ0u70IrjxLSM7r6stP!tr0n}(F{EN>Vmi_&EiAkvWiPAtV;Hm6a!b`C)ZwGZ
z!<cN#AfV}_Y;QYh@LdsyC&${phi%_G0bth{6jv1*4_BcPz)}DB);kv>S3e@=@BrX8
ziv^Wc!9$iVpG{v?0R}^_kH^fc<+3%fXv&)rdD{kR!0yvFIFGz1>pkYtkKx{QD^fW%
zB)pLYO922!%l{@D;+9h@$m4AXi6XZD#TwiOc5YB7WPBnU-r%uMMFj7M4m&>Gx<EEO
z0B|0851(#bfa;E#knpTY1+XR+1VGA>1iwjR62dQGOG+}(Ebm46sbj+aO?5{Nz9@NG
zwI%jN$x}f;?}XPW)}#WUV5uxkw50UMMF313+zZcoaetsKLT<-EYTm-j=~;+n+uavd
zQ?7=0B}6%zINV{A3?38ayjFHCz;=CmpjSoiq=zSmU%I<b+j<P1Qixv52U$cwONS7|
z2C}4@DMnL?+=*wIhJ^LDN^G7Q@RUHbn2c2bz+$jK+TX`wHuRIde8ZKbZ2R7cDZJ5z
ze~k#9T!<!vp-ZOL1z@LfOg5TiP2OTm4I3nP7w4%3Z$e`9+mg{hG#iZm*pGrOVSmur
zyhmQns0&>vsCCrF4BpQQm&t+`EyUptTbFR}syI+tn~W(8z;o^kF@sl-I9~BM(P$zC
z3uB0s6<*@ChLF#jt9JETc+o=SU;vfYt@O}@e6F_ryWOfTyyzfO_+moTMmkL4;14sl
zs9HTaY+H%LGT-ObI`Prwd8z;xBDH`=%3el=qeAsxJQmdx!4x{6cSBV8h9FLaIlL25
z8)7Wr0YFOj<dDxj9hVf1AJmCNY6aDT7%O;EOnOVm=MIlk*0^4s<r;#*)mTp@-5qm?
zv4jTz8RpOx>t>I<Qj=Yu-I;X+vw_lwO|7n&YGSP6#aSj|5QWak&$Kqk8r$h^^}`Al
zNQ><MqsZ+;v=Czr4*&{BJ{a=3OWT5rhu)Pnw#)7I`->pe81jd4jjgVzcD^Hpcs<}H
zk9iz9y5XTy$`<)4rLX=`sl8MPVgt4AcrXK+vkRhb{tE~3dcXsKpQnen-^ZKnvd4G0
zq$Ql74N{HSvf>W^F;m8gr0CoJyMuVW;1x~%CkBWELg(XrMs_FH@x($YP+`V~=L&;`
zF_$Bm`o<<%FS#0GsEwYfMQ^DJFGDjl?BDG_e^~ZA>Khw_rW{=WlE0|hV*ico(o84B
zaJytfwVC+E%nxB6{g@(~_p6y7Mg*_gdlK~uIu%;%b4k)M>Ncnb08A?`1Bfuj`V|jr
zDphrvbysdb;W>uVuiuWi;Gny88YbLUgdAONWZ{R_iT^0beNQG&#5cA{1ZM2Gs)JwK
zU7}*Iug5T5?BM}GjxHBD6W>G~*Wm}pY1F$Lu4(N^%$|%iV=9K4)5FGjS4-)caz%5m
zK6kd;XWHPYGQ(}3OUQkRV-4?0NuxBRC8YsL00#e3l^<@e^J|<vsLbBB*32V@2(6a8
zuf}xBjwJ;k06tMfDUVY81yb{$jB2AtO*!PM#5cB=6pc~JqrjqcL^jx=M4{Vq12cX+
zF<bF**oMlt@wIdBb%$5(*o%Fo%M_1u@%U_#wtR!52nuk=qCzkMKA#91k5oK~!?u;!
z)=&bs))8}X%~}^eJHH*@maSAgR;f4wq9`3A-??N$<NyIcVCkNg^T%eZa;m-Vz?)dJ
zc|NMzV|U7_+Ite~H$S3Ex4uu4fD6aw(3NR!FzNQusW0BgZBrfx0DK#7?>9>CyjzVg
zX|LXfdUFaAjQx;6W>vtQ<1_g3{2o;^o=wfEPoO3502tV@xO*EOQoE+C+7E%fAR=Vt
zZ{>W?K~*(II%t!HG*dcE9SPA@Mzk%cZK=iaX1nSKZT7|GqxSGj0t3`WArIPwU7pj6
z%fKXEBr)sue{;O|d`y<#fV_nmVjPGhT@n&?X2fZYft|iK_|V?b3WvvuW=}KDv^K~t
zNrjX1N#jvgK9wZfCt$~t&>Qv<*|*M{hYWfhW@Ig6^kLany^`Gis{nQ`4u5VqqSKn@
zwgfN(?luoLx7>Q5ufqGUBYm|54@kTenSGAf!%izMml`mMpvzdpvkdk=1#gQx6P}v+
z#LN&#!1l$F_1Z*yVtvPw0>4FKcxvX;?)IEM18;YG4m>sU31Db|h~Y)0fq~jvu?<Aj
zXD*!xXdW2s14@<_M)m(fv@a}KVub(#18B9+qxH^P*Wak{HagQ+OYi^z6g50q8rUf_
zip${hUu)M-ufv4AO`PJaydl6fn)9*u&_mSeFxV%eWU0K{ixj14_rGd`uY&+02t>%p
z`%Lv<TW#4Fmyfz{W(BT(@{tdpFP<oSJVD81wmxq~hUs+y07Owlb>;oE!I4%JXo2WO
z;?pGHljgLd+QT#bK{AkGdR<TgPq7Ae4Rb2MB!c|c-whbPk?#?X_6m5V;s{(gHb-(4
z{!nbkqF!?S-8H#0yn!|mjYdHKoQ*wpkKmOTF#02~u(@rI0t|#Yuj~Q&gus=>0tql?
zt>a9K1!`|pT`eb*C!+e?S-9=<r7J+Wvn5>Uwx-wX0CoW>YJkqGiUH{2<B*WKjx8zu
z16}V*<#=Kt>Khx;VxLPMZ@XXF{8eP8n1H)30531?QV7sq`!WI&O-2Zo4>-YKfZ1RS
z3Dv8!z^>1N)9r@K?M9ueHQP}CX!SL%jVgH8UInmAdF<~tupnH%KwAy*?^!Tnt8Kjk
z;FU7xwK6!o41xwk{+o6|QvV%O;Pg~rlAVo>#9$Ucg4F19Wv|LjxhX#_`9C=^R{rX}
R4z~aR002ovPDHLkV1ncoaTfpp

literal 0
HcmV?d00001

diff --git a/src/Client/src/main/resources/icons/refresh2.png b/src/Client/src/main/resources/icons/refresh2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e3f9466b5eac87d328d1faf9fb9843fbde0edbe
GIT binary patch
literal 1549
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

literal 0
HcmV?d00001


From 2b7d51a5eda1d7dd1adb9ea53e5645654c01e685 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <s.vanderhoeven@student.tudelft.nl>
Date: Fri, 5 Apr 2019 13:13:27 +0200
Subject: [PATCH 2/2] EDIT::edited font size of random hints

---
 src/Client/src/main/resources/fxml/dashboard.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index a91f6d3..614d721 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -55,7 +55,7 @@
             </Label>
             <Text fill="#002c0c" layoutX="14.0" layoutY="415.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Random hint!">
                <font>
-                  <Font size="18.0" />
+                  <Font size="20.0" />
                </font>
             </Text>
             <Button fx:id="refreshHintsButton" layoutX="157.0" layoutY="390.0" mnemonicParsing="false" onAction="#addRandomHints" style="-fx-background-color: transparent;">