Changed print function as part of saveData, so it prints all data instead the first 10 points.
changed indents on #define [SYNTAX]
fixed messy merge after htoi was added
Merge branch 'master' of https://github.com/mganger/Balloon-2014

Conflicts:
	slave/src/Data.cpp