test
Merge branch 'master' of https://github.com/kmn1024/ShoppingMall

Conflicts:
	.gitignore