none
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
	ActivityChart.png
	BMIChart.png
	CaloriesChart.png
	GlucoseChart.png
	HeartRateChart.png
	HeightChart.png
	PressureChart.png
	SleepChart.png
	StepsChart.png
	WeightChart.png
	nbproject/private/private.properties
	nbproject/private/private.xml