tuika
Merge branch 'kitazawa_div' of https://github.com/TeamKIES/KIESPractice

Conflicts:
	test.txt