うごかない
Merge branch 'master' of github.com:Nshiba/ShootingArtOnline

Conflicts:
	.gitignore
	NetBeansProject/ShootingArtOnline/nbproject/private/private.properties