init
init
Merge branch 'master' of https://github.com/yunchiri/ajoudailyfood

Conflicts:
	.gitignore
add ream