Merge pull request #13 from LionelCursor/master

Heart Rate can run now
Merge pull request #14 from LionelCursor/master

add pedometer
homecontrol
Merge branch 'master' of https://github.com/w821881341/HealthLife

Conflicts:
	HealthSLife/.classpath
pull