build.logはぷっしゅしないで
Merge branch 'dev' of https://github.com/hajipion/aiai into dev

Conflicts:
	build.log