firstcomit
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
terakawa v1.001