init
Merge branch 'master' of https://github.com/moribiru97/java8_test

Conflicts:
	.project