1
Merge branch 'master' of https://github.com/lovemyselfbest/FoodSys

Conflicts:
	.gitignore
	4_SourceCode/FoodSys.Web/Log/Sys/file