Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

diff --cc server/actuator.c
Simple merge

diff --cc server/actuator.h
Simple merge

diff --cc server/fastcgi.c
Simple merge

diff --cc server/sensor.c
index 64c7aa9,9d0b33c..e429958
--- 1/server/sensor.c
--- 2/server/sensor.c
+++ b/server/sensor.c
@@@ -39,7 -43,16 +43,15 @@@ void Sensor_Init(
        {
                g_sensors[i].id = i;
                Data_Init(&(g_sensors[i].data_file));
 -              g_sensors[i].record_data = false;       
        }
+ 
+       // Get the ADCs
+       ADC_Export();
+ 
+       // GPIO1_28 used as a pulse for sampling
+       GPIO_Export(GPIO1_28);
+       // GPIO0_30 toggled during sampling
+       GPIO_Export(GPIO0_30);
  }
  
  /**

diff --cc server/sensor.h
Simple merge