basic complement
try to solve confict
Merge branch 'master' of https://github.com/lihongjing/TrainingBudget

Conflicts:
	.DS_Store
try to upload