userlist commit
Merge branch 'shuntaro4'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/shuntaro4/meron

Conflicts:
	.gitignore