cleaning up stuff
Merge branch 'master' of https://github.com/eugeneration/FitBitch

Conflicts:
	SensorGraph_02/.metadata/.plugins/org.eclipse.cdt.core/.log
	SensorGraph_02/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

blah