nothing there
Merge branch 'master' of github.com:WarwickPARSE/parse-client

Conflicts:
	PARSE/Tracking/SensorTracker.cs
work in progress
Merge branch 'master' of github.com:WarwickPARSE/parse-client
some changes i made to the sensor tracker
Merge branch 'master' of github.com:WarwickPARSE/parse-client

Conflicts:
	PARSE/Tracking/SensorTracker.cs
triangulation of sensor distance
Merge branch 'master' of github.com:WarwickPARSE/parse-client
made some changes to the skeleton point, we are getting correct height but wrong x, need to test with nathan asap