first commit
Merge branch 'master' of github.com:takayuki-shiraishi/musou_rizing

Conflicts:
	.gitignore