Started working on resampling script
Merge branch 'master' of https://github.com/andykee/uclathesis

Conflicts:

data/flight_test_data/raw/20131013181929_hover_40Hz/20131013181929_acc.c
sv

data/flight_test_data/raw/20131013181929_hover_40Hz/20131013181929_gyro.
csv

data/flight_test_data/raw/20131013181929_hover_40Hz/20131013181929_motor
.csv