git ignore 추
Merge branch 'master' of https://github.com/swcho/ex_spring

Conflicts:
	.gitignore