weight and distance samples collected
Merge branch 'develop' of https://github.com/HLFY/HLFY into develop

Conflicts:
	hlfy/hlfy/ViewController.swift
conflict resolved