test
Merge branch 'master' of https://github.com/syupein/oct.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Merge branch 'master' of https://github.com/syupein/oct.git