no message
Merge branch 'master' of https://github.com/Hirosuwa/StudyGeneral

Conflicts:
	.settings/org.eclipse.jdt.core.prefs