add files
Merge branch 'master' of https://github.com/zxjzerg/FitnessHelper

Conflicts:
	.gitignore