コメントを修正
Merge branch 'master' of https://github.com/johniojohnny/RenKan.git

Conflicts:
	src/jp/ne/okazaki/Renkan/RenkanMain.java