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

Conflicts:
	server/sensor.c

diff --cc server/sensor.h
index 9bdefda,36fdb27..dd919f9
--- 1/server/sensor.h
--- 2/server/sensor.h
+++ b/server/sensor.h
@@@ -44,10 -58,10 +58,12 @@@ typedef struc
        int write_index;
        /** Number of points read **/
        long points_read;
+       /** Number of points written to file **/
+       long points_written;
        /** Binary file to write data into when buffer is full **/
        FILE * file;
 +      /** Number of data points stored in file **/
 +      long points_stored;
        /** Thread running the sensor **/
        pthread_t thread;
        /** Mutex to protect access to stuff **/