add test.txt
Merge branch 'master' of https://github.com/js9261012/Eatogether

Conflicts:
	.DS_Store