test Git
Merge branch 'master' of https://github.com/taier/Life-Helper

Conflicts:
	TESTING.md