Soyoon add
Merge branch 'master' of https://github.com/Nexters/Study

Conflicts:
	.gitmodules