From 02d03b4a60ed69f0e26feb50f61517df693eb544 Mon Sep 17 00:00:00 2001
From: Clair Blacketer <mblacke@its.jnj.com>
Date: Fri, 20 Aug 2021 08:50:18 -0400
Subject: [PATCH 1/3] Resolving conflicts

---
 .DS_Store | Bin 8196 -> 8196 bytes
 DS_Store  | Bin 0 -> 10244 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 DS_Store

diff --git a/.DS_Store b/.DS_Store
index 33999f634872ff4a66ac858a229ebc2dfcdab333..6b68fc98e60c7ca47973c33a9fbde229f961f44f 100644
GIT binary patch
delta 135
zcmZp1XmOa}FDT8xz`)4BAi$7PoSc)CpP#d_a2or>2Eonj94s6mAXyd$J%)6KOokGe
z3ZNJRJ4}!vgQ1im30aC8C>6v|z)-}H&yWRVmogMHq%su2m2Bn_n9j1XM38wiyTo61
E0Cy!I<p2Nx

delta 54
zcmZp1XmOa}FDk*nz`)4BAi%&-%8<%X#8By(lb^gXaWVU5b`BN}Mv2Yw0@GPGFXl;M
K-pnrXmmL6FhYj%n

diff --git a/DS_Store b/DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..94331697f17fbb18725b12338975282e4105c8f6
GIT binary patch
literal 10244
zcmeHMOK%fN5U!3*n1q*w(4ru%G(vzlL{^*)fviC5IL;vw4-+FI76P#|7BR9tUfUtN
zc!PXJyNA_s0P*?*fcOJ&fddkV14xJ~|6sZ7ffIcF@T7Zea{_@-w=`YtsrtIRzUt{#
zwTXzOmc0a#OGFMHE@K-}btzoWpN`U}-uwi~fG6^(L@CNqoeCY+_Jw7@GGH073|Iy%
z1K$DzIJ0?iHb`k}%YbFTG7vDp_Xigbmq{gCQi`nul}G^~qj)U}+Q<V0##J(@WJ^i`
zMV~TzU<%4qioqltdY79+CY5YSDdEH<oR}J!sSJgQ(SdV?IkBXawzdpd209twxqFPJ
zkhzyBZRGE9nx!h$$fpZ4C4Vtr^7F!$Xc991K@`#91|X*?i(Y1FhB9;l^)WgcLOlqf
zq8QDmMXH;2?8jbq`IUNA&EjdkS}N8XBO`BEUnIJ&f4$=jI)j@A=d(-xO16<}EZ0-H
z+G+kPlWQ#HRr`eRmx6XKf3jFuITzbD<yRWHVx>?M;G$Q6$(gxg#q(EE{&K~ui+-|F
z;Wz`%z`58D&F09kyMKIj*li}p#&~;TVs&-E*}gk*Xl9}O$ED_<tCz0{dWfk#i?+z$
zL46&qfCjI=SjuC9TpPSBolj&J{c=@6u4c~Yy0V{6D?XfqFMhfD@7NO_nE+e%y-(_^
zOIqL8#1H}YVzyQ(`IYnNk57IJ?sIBlEz}U>0@j6(Uk!@m`JEb}2>u0xzCQYafE5t9
z88U7A_y|31wTM6a+7TaWHWTCf_YJ$_qax^|`$o~8IM5OF8}JCFXV7m#X)vM(-cT69
zzjg0Y7^p9Rhxt=y@BjChF94$teG&AsF&4t@5p-ep5n2pUDpCbke4()Sy#`JXWnlN+
zhB5H49YX%C1TT&74L$O7ogTX874P8Pmm+ilRu5Y@y%Dk<@6h$yxS?>Zr^DEfr?5jG
z#U4Fvet+yekb2M}I0tf6F|8s~-K`7{Y3FuWDZK9A-_L(uh)e$h?b^=NsWp6~f6yrn
zVD6K2M4U1iwBU_7LvbeE(axlP>`=?tbE>=!+47U9r>)^r?6-@sHTu#$+qvui$E{cD
zqtnLIqu0yE@N#R0d&y|loGIfwsXkL!81tiJa}uY|YU}YmZN6cz&&AXjGidWX3yvpo
zo^!6_SPNcgM*MWvXB5G%-f6{GRTr!FX96u2iU1n!49(B4X>^x<-F&EhyeXXSR;Si*
zZO2<ao-LLE%YbFTGGH073<w4yk_VUH|4;Y+|KGA@8L$j|#|*G&I-5?xL7u*LEBvnA
z#j}8i7jD;*Qb16N>v%|U9giRUI({!6ZYypSR6D6;OG*KUjetYS+x##7XTWE=#tG8(
cc4EWb30|71jm`hTjm`gqI|(C2{R;X2M}q+m=l}o!

literal 0
HcmV?d00001


From 83d6a303769a3790025b4503a145539812dc38bb Mon Sep 17 00:00:00 2001
From: Clair Blacketer <mblacke@its.jnj.com>
Date: Fri, 20 Aug 2021 08:52:52 -0400
Subject: [PATCH 2/3] Removing unnecessary file

---
 DS_Store | Bin 10244 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 DS_Store

diff --git a/DS_Store b/DS_Store
deleted file mode 100644
index 94331697f17fbb18725b12338975282e4105c8f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHMOK%fN5U!3*n1q*w(4ru%G(vzlL{^*)fviC5IL;vw4-+FI76P#|7BR9tUfUtN
zc!PXJyNA_s0P*?*fcOJ&fddkV14xJ~|6sZ7ffIcF@T7Zea{_@-w=`YtsrtIRzUt{#
zwTXzOmc0a#OGFMHE@K-}btzoWpN`U}-uwi~fG6^(L@CNqoeCY+_Jw7@GGH073|Iy%
z1K$DzIJ0?iHb`k}%YbFTG7vDp_Xigbmq{gCQi`nul}G^~qj)U}+Q<V0##J(@WJ^i`
zMV~TzU<%4qioqltdY79+CY5YSDdEH<oR}J!sSJgQ(SdV?IkBXawzdpd209twxqFPJ
zkhzyBZRGE9nx!h$$fpZ4C4Vtr^7F!$Xc991K@`#91|X*?i(Y1FhB9;l^)WgcLOlqf
zq8QDmMXH;2?8jbq`IUNA&EjdkS}N8XBO`BEUnIJ&f4$=jI)j@A=d(-xO16<}EZ0-H
z+G+kPlWQ#HRr`eRmx6XKf3jFuITzbD<yRWHVx>?M;G$Q6$(gxg#q(EE{&K~ui+-|F
z;Wz`%z`58D&F09kyMKIj*li}p#&~;TVs&-E*}gk*Xl9}O$ED_<tCz0{dWfk#i?+z$
zL46&qfCjI=SjuC9TpPSBolj&J{c=@6u4c~Yy0V{6D?XfqFMhfD@7NO_nE+e%y-(_^
zOIqL8#1H}YVzyQ(`IYnNk57IJ?sIBlEz}U>0@j6(Uk!@m`JEb}2>u0xzCQYafE5t9
z88U7A_y|31wTM6a+7TaWHWTCf_YJ$_qax^|`$o~8IM5OF8}JCFXV7m#X)vM(-cT69
zzjg0Y7^p9Rhxt=y@BjChF94$teG&AsF&4t@5p-ep5n2pUDpCbke4()Sy#`JXWnlN+
zhB5H49YX%C1TT&74L$O7ogTX874P8Pmm+ilRu5Y@y%Dk<@6h$yxS?>Zr^DEfr?5jG
z#U4Fvet+yekb2M}I0tf6F|8s~-K`7{Y3FuWDZK9A-_L(uh)e$h?b^=NsWp6~f6yrn
zVD6K2M4U1iwBU_7LvbeE(axlP>`=?tbE>=!+47U9r>)^r?6-@sHTu#$+qvui$E{cD
zqtnLIqu0yE@N#R0d&y|loGIfwsXkL!81tiJa}uY|YU}YmZN6cz&&AXjGidWX3yvpo
zo^!6_SPNcgM*MWvXB5G%-f6{GRTr!FX96u2iU1n!49(B4X>^x<-F&EhyeXXSR;Si*
zZO2<ao-LLE%YbFTGGH073<w4yk_VUH|4;Y+|KGA@8L$j|#|*G&I-5?xL7u*LEBvnA
z#j}8i7jD;*Qb16N>v%|U9giRUI({!6ZYypSR6D6;OG*KUjetYS+x##7XTWE=#tG8(
cc4EWb30|71jm`hTjm`gqI|(C2{R;X2M}q+m=l}o!


From 39213577c3e8e79575f063e029b9bc3eb55dc93b Mon Sep 17 00:00:00 2001
From: Clair Blacketer <mblacke@its.jnj.com>
Date: Fri, 20 Aug 2021 09:34:21 -0400
Subject: [PATCH 3/3] Trying again to remove .DS_Store, adding to gitignore

---
 .DS_Store  | Bin 8196 -> 0 bytes
 .gitignore |  10 ++++++++++
 2 files changed, 10 insertions(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 6b68fc98e60c7ca47973c33a9fbde229f961f44f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMPiqrF6n~q<c9SYb@J~U674cR|1Etb~5c3BqRIRSqgG#!|Zj;C+8?&3lHb!#y
zBp&L?ub_SgK|g``HN1M#-<#Ql&9)W1i0Dk1d9(B0@4eaIzL{k<M5GmZc8+L~h;&qz
z*#$I56xMS+R1)FHMMw>Jvi+J{^*r~Gr5aESC<YV*iUGxdV&HFK0Pk!r`Z4c)sa36F
zKr!%NGQj(Tfyy!;%CVGU>p&xp0FWsRi-LZZJCH^w^PwC|2@Q%Sp^y@)g+~lc!ZB`y
zcKJ|_rIc{e!o!CaM%Ka;iYB7Nzah*?%S)+R#eibqFavycPth{fsYyZf{60S!qz3h<
z8dWVob&opKC6At<-y@$K>PAg;D!^f#?m`I_?QOVTt?GJJgyR)@19ka_DCiNLq#~Tz
zur1RwstHVo0`g<HcQITN7@OQlXx<!B81Uf2uMYf981i$q<2L<ZW#y}uNTyEA&Fgwb
z&z#CUHXGi+46LB%7p(3>zS^>aMm6l;$G41W->N=nI)h5~Y|(26R<rGN1-NNDFnP4y
zY}?+T;Pu+JFZ`HNq3dZqUCEvw4p)|pYipw=W0+fA<^KBmXq473T+LnI*lF$U51)@-
z955BwyTUz=PRr|Q`v$$~?M?2PwbMbjo-=D+t0N$<-(QL9T3)FX@}b|n{3-Ej^&>xq
zDYoU=ztndc5#I;jIK&j&H@j`uYu7Qxlb@pvY9T``a><%~gxX8!qmMp?L}?>~V%fI|
z7e!>lZ8E7GbMZaqVjflwvc;i&{9*wUJgI2FGjxY;p>9zH5lZM+s84HXSCGs|9O}=;
zOMLk)4;>`n?yQGoG3H?o@w=d>27;WJ?T47{In2}&)-GG4mT(=QZi{gTE7X&VaMqJp
zWp5*^ECWv-Q;n6`g(nm1b2EnF6&A&$vDC}(#5|S3PmAnXgmx*0(1CEkfsc7LX_tbS
zJtsgkLK1U<*JwUxFtw++Q3H~<k3P3CH=G1fH%DS7PA4l07*!MliUDRIDQQ^b^MCpH
z@Bh+DwTc17z(2`=mMWR00&eZNw<Mpn4b&Y}E^IfJQb5p%<2a-^jzdoWFht*gDP!`X
U97~B26!jrM(4ZQ{z#nDcCmx1QXaE2J

diff --git a/.gitignore b/.gitignore
index 5d6a798..dc712cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,13 @@
 .RData
 .Ruserdata
 extras/CodeToRun.R
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db