test
Merge branch 'master' of https://github.com/cybeans/study.git

Conflicts:
	Study/src/jp/co/cybeans/Study.java