コンフリクト
Merge branch 'choose_remote_name/master' of local repository

Conflicts:
	.gitignore
	build/classes/filter/UserFilter.class
	build/classes/top/SignIn.class
	build/classes/top/SignUp.class