commit 3-1
commit 3-2
Merge branch 'feature/thirdbranch' into develop

Conflicts:
	aiu.txt
	kakiku.txt