Merge remote-tracking branch 'refs/remotes/origin/master'

modified:   CS_analysis.cpp
	modified:   CS_fit.cpp
	modified:   CuFluo_fit.cpp

CS_analysis.cpp

@@ -669,6 +669,13 @@ cout << " G0->G1->G2 sequence - dynamicG0" <<endl;
   scan_v6.push_back("604"); //jfcalib-5
   scan_v6.push_back("604_fullspeed"); //jfcalib-5
 
+
+  scan_v6.push_back("367_Kirsty"); //jfcalib-4
+  scan_v6.push_back("367_Kirsty_fullspeed"); //jfcalib-4
+  scan_v6.push_back("604_Kirsty"); //jfcalib-5
+  scan_v6.push_back("604_Kirsty_fullspeed"); //jfcalib-5
+
+
   scan_v6.push_back("628"); //jfcalib-0
   scan_v6.push_back("628_fullspeed"); //jfcalib-0
   scan_v6.push_back("627"); //jfcalib-1

CS_fit.cpp

@@ -651,6 +651,10 @@ int main(int argc, char* argv[]) {
   scan_v6.push_back("603"); //jfcalib-5
   scan_v6.push_back("603_fullspeed"); //jfcalib-5
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> refs/remotes/origin/master
   scan_v6.push_back("578"); //jfcalib-0
   scan_v6.push_back("578_fullspeed"); //jfcalib-0
   scan_v6.push_back("588"); //jfcalib-2
@@ -673,6 +677,10 @@ int main(int argc, char* argv[]) {
   scan_v6.push_back("589"); //jfcalib-5
   scan_v6.push_back("589_fullspeed"); //jfcalib-5
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> refs/remotes/origin/master
   scan_v6.push_back("586"); //jfcalib-0
   scan_v6.push_back("586_fullspeed"); //jfcalib-0
   scan_v6.push_back("607"); //jfcalib-1
@@ -681,6 +689,7 @@ int main(int argc, char* argv[]) {
   scan_v6.push_back("609_fullspeed"); //jfcalib-2
   scan_v6.push_back("625"); //jfcalib-3
   scan_v6.push_back("625_fullspeed"); //jfcalib-3
+<<<<<<< HEAD
   scan_v6.push_back("626"); //jfcalib-4
   scan_v6.push_back("626_fullspeed"); //jfcalib-4
 
@@ -711,6 +720,11 @@ int main(int argc, char* argv[]) {
   scan_v6.push_back("604"); //jfcalib-4
   scan_v6.push_back("604_fullspeed"); //jfcalib-4
   scan_v6.push_back("701_Vadym");
+=======
+  scan_v6.push_back("526"); //jfcalib-4
+  scan_v6.push_back("526_fullspeed"); //jfcalib-4
+
+>>>>>>> refs/remotes/origin/master