# 효빈's license
Merge remote-tracking branch 'origin/#Hyobin-issue' into #1_Making_Project

Conflicts:
	LICENSE