Merge branch 'master' of https://github.com/gaku-takeno/gakunet

Conflicts:
	iOS/test.txt
Merge branch 'master' of https://github.com/gaku-takeno/gakunet